<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[278978] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/278978">278978</a></dd>
<dt>Author</dt> <dd>eocanha@igalia.com</dd>
<dt>Date</dt> <dd>2021-06-17 02:18:02 -0700 (Thu, 17 Jun 2021)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GStreamer] Refactor MediaPlayerPrivateGStreamer::notifyPlayerOf*
https://bugs.webkit.org/show_bug.cgi?id=204686
Reviewed by Philippe Normand.
Refactored the notifyPlayerOf{Audio,Video,Text} family of methods into a single notifyPlayerOfTrack() one.
Some Variant variables are needed in order to make several incompatible types work together and to auto-detect the type of track as an enum.
Covered by existing tests.
* platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h:
(WebCore::InbandTextTrackPrivateGStreamer::create): Added method with a signature similar to the ones used by {Audio,Video}TrackPrivateGStreamer, so that it fits into the notifyPlayerOfTrack() template code.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfTrack): Template method that unifies the old notifyPlayerOf{Audio,Video,Text}() implementations.
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio): Deleted. Refactored into notifyPlayerOfTrack().
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::audioChangedCallback): Call the new notifyPlayerOfTrack() refactored implementation.
(WebCore::MediaPlayerPrivateGStreamer::textChangedCallback): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::videoChangedCallback): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::purgeInvalidAudioTracks): Deleted. Now implemented directly inside notifyPlayerOfTrack().
(WebCore::MediaPlayerPrivateGStreamer::purgeInvalidVideoTracks): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::purgeInvalidTextTracks): Ditto.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: Deleted notifyPlayerOf{Audio,Video,Text}(), added notifyPlayerOfTrack(), deleted purgeInvalid{Audio,Video,Text}Tracks().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278977 => 278978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2021-06-17 08:38:46 UTC (rev 278977)
+++ trunk/Source/WebCore/ChangeLog 2021-06-17 09:18:02 UTC (rev 278978)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2021-06-17 Enrique Ocaña González <eocanha@igalia.com>
+
+ [GStreamer] Refactor MediaPlayerPrivateGStreamer::notifyPlayerOf*
+ https://bugs.webkit.org/show_bug.cgi?id=204686
+
+ Reviewed by Philippe Normand.
+
+ Refactored the notifyPlayerOf{Audio,Video,Text} family of methods into a single notifyPlayerOfTrack() one.
+ Some Variant variables are needed in order to make several incompatible types work together and to auto-detect the type of track as an enum.
+
+ Covered by existing tests.
+
+ * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h:
+ (WebCore::InbandTextTrackPrivateGStreamer::create): Added method with a signature similar to the ones used by {Audio,Video}TrackPrivateGStreamer, so that it fits into the notifyPlayerOfTrack() template code.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfTrack): Template method that unifies the old notifyPlayerOf{Audio,Video,Text}() implementations.
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio): Deleted. Refactored into notifyPlayerOfTrack().
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::audioChangedCallback): Call the new notifyPlayerOfTrack() refactored implementation.
+ (WebCore::MediaPlayerPrivateGStreamer::textChangedCallback): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::videoChangedCallback): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidAudioTracks): Deleted. Now implemented directly inside notifyPlayerOfTrack().
+ (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidVideoTracks): Ditto.
+ (WebCore::MediaPlayerPrivateGStreamer::purgeInvalidTextTracks): Ditto.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: Deleted notifyPlayerOf{Audio,Video,Text}(), added notifyPlayerOfTrack(), deleted purgeInvalid{Audio,Video,Text}Tracks().
+
</ins><span class="cx"> 2021-06-16 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Make FontFaceSet::Iterator's bounds check more robust
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h (278977 => 278978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h 2021-06-17 08:38:46 UTC (rev 278977)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h 2021-06-17 09:18:02 UTC (rev 278978)
</span><span class="lines">@@ -44,6 +44,11 @@
</span><span class="cx"> return adoptRef(*new InbandTextTrackPrivateGStreamer(index, pad));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static Ref<InbandTextTrackPrivateGStreamer> create(WeakPtr<MediaPlayerPrivateGStreamer>, gint index, GRefPtr<GstPad> pad)
+ {
+ return create(index, pad);
+ }
+
</ins><span class="cx"> static Ref<InbandTextTrackPrivateGStreamer> create(gint index, GRefPtr<GstStream> stream)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new InbandTextTrackPrivateGStreamer(index, stream));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (278977 => 278978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-06-17 08:38:46 UTC (rev 278977)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-06-17 09:18:02 UTC (rev 278978)
</span><span class="lines">@@ -962,31 +962,51 @@
</span><span class="cx"> setSyncOnClock(audioSink(), sync);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamer::notifyPlayerOfVideo()
</del><ins>+template <typename TrackPrivateType>
+void MediaPlayerPrivateGStreamer::notifyPlayerOfTrack()
</ins><span class="cx"> {
</span><span class="cx"> if (UNLIKELY(!m_pipeline || !m_source))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_isLegacyPlaybin || isMediaSource());
</span><ins>+ ASSERT(typeName);
</ins><span class="cx">
</span><ins>+ enum TrackType { Audio = 0, Video = 1, Text = 2 };
+ Variant<HashMap<AtomString, RefPtr<AudioTrackPrivateGStreamer>>*, HashMap<AtomString, RefPtr<VideoTrackPrivateGStreamer>>*, HashMap<AtomString, RefPtr<InbandTextTrackPrivateGStreamer>>*> variantTracks = static_cast<HashMap<AtomString, RefPtr<TrackPrivateType>>*>(0);
+ auto type(static_cast<TrackType>(variantTracks.index()));
+ auto typeName = (const char*[]) { "audio", "video", "text" }[type];
+ auto* hasType = (bool*[]) { &m_hasAudio, &m_hasVideo, nullptr }[type];
+ switch (type) {
+ case Audio: variantTracks = &m_audioTracks; break;
+ case Video: variantTracks = &m_videoTracks; break;
+ case Text: variantTracks = &m_textTracks; break;
+ }
+ HashMap<AtomString, RefPtr<TrackPrivateType>>& tracks = *get<HashMap<AtomString, RefPtr<TrackPrivateType>>*>(variantTracks);
+
</ins><span class="cx"> // Ignore notifications after a EOS. We don't want the tracks to disappear when the video is finished.
</span><del>- if (m_isEndReached)
</del><ins>+ if (m_isEndReached && (type == Audio || type == Video))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- unsigned numTracks = 0;
</del><ins>+ unsigned numberOfTracks = 0;
</ins><span class="cx"> bool useMediaSource = isMediaSource();
</span><ins>+
+ StringPrintStream numberOfTracksProperty;
+ numberOfTracksProperty.printf("n-%s", typeName);
+
</ins><span class="cx"> GstElement* element = useMediaSource ? m_source.get() : m_pipeline.get();
</span><del>- g_object_get(element, "n-video", &numTracks, nullptr);
</del><ins>+ g_object_get(element, numberOfTracksProperty.toCString().data(), &numberOfTracks, nullptr);
</ins><span class="cx">
</span><del>- GST_INFO_OBJECT(pipeline(), "Media has %d video tracks", numTracks);
</del><ins>+ GST_INFO_OBJECT(pipeline(), "Media has %d %s tracks", numberOfTracks, typeName);
</ins><span class="cx">
</span><del>- bool oldHasVideo = m_hasVideo;
- m_hasVideo = numTracks > 0;
- if (oldHasVideo != m_hasVideo)
- m_player->characteristicChanged();
</del><ins>+ if (hasType) {
+ bool oldHasType = *hasType;
+ *hasType = numberOfTracks > 0;
+ if (oldHasType != *hasType)
+ m_player->characteristicChanged();
</ins><span class="cx">
</span><del>- if (m_hasVideo)
- m_player->sizeChanged();
</del><ins>+ if (*hasType && type == Video)
+ m_player->sizeChanged();
+ }
</ins><span class="cx">
</span><span class="cx"> if (useMediaSource) {
</span><span class="cx"> GST_DEBUG_OBJECT(pipeline(), "Tracks managed by source element. Bailing out now.");
</span><span class="lines">@@ -994,16 +1014,20 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<String> validVideoStreams;
- for (unsigned i = 0; i < numTracks; ++i) {
</del><ins>+ Vector<String> validStreams;
+ StringPrintStream getPadProperty;
+ getPadProperty.printf("get-%s-pad", typeName);
+
+ for (unsigned i = 0; i < numberOfTracks; ++i) {
</ins><span class="cx"> GRefPtr<GstPad> pad;
</span><del>- g_signal_emit_by_name(m_pipeline.get(), "get-video-pad", i, &pad.outPtr(), nullptr);
</del><ins>+ g_signal_emit_by_name(m_pipeline.get(), getPadProperty.toCString().data(), i, &pad.outPtr(), nullptr);
</ins><span class="cx"> ASSERT(pad);
</span><span class="cx">
</span><del>- String streamId = "V" + String::number(i);
- validVideoStreams.append(streamId);
- if (i < m_videoTracks.size()) {
- RefPtr<VideoTrackPrivateGStreamer> existingTrack = m_videoTracks.get(streamId);
</del><ins>+ String streamId = String(typeName).substring(0, 1).convertToASCIIUppercase() + String::number(i);
+ validStreams.append(streamId);
+
+ if (i < tracks.size()) {
+ RefPtr<TrackPrivateType> existingTrack = tracks.get(streamId);
</ins><span class="cx"> if (existingTrack) {
</span><span class="cx"> existingTrack->setIndex(i);
</span><span class="cx"> // If the video has been played twice, the track is still there, but we need
</span><span class="lines">@@ -1014,18 +1038,28 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto track = VideoTrackPrivateGStreamer::create(makeWeakPtr(*this), i, pad);
- if (!track->trackIndex())
</del><ins>+ auto track = TrackPrivateType::create(makeWeakPtr(*this), i, pad);
+ if (!track->trackIndex() && (type == Audio || type == Video))
</ins><span class="cx"> track->setActive(true);
</span><span class="cx"> ASSERT(streamId == track->id());
</span><del>- m_videoTracks.add(streamId, track.copyRef());
- m_player->addVideoTrack(track.get());
</del><ins>+ tracks.add(streamId, track.copyRef());
+
+ Variant<AudioTrackPrivate&, VideoTrackPrivate&, InbandTextTrackPrivate&> variantTrack(track.get());
+ switch (variantTrack.index()) {
+ case Audio: m_player->addAudioTrack(get<AudioTrackPrivate&>(variantTrack)); break;
+ case Video: m_player->addVideoTrack(get<VideoTrackPrivate&>(variantTrack)); break;
+ case Text: m_player->addTextTrack(get<InbandTextTrackPrivate&>(variantTrack)); break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- purgeInvalidVideoTracks(validVideoStreams);
</del><ins>+ // Purge invalid tracks
+ tracks.removeIf([validStreams](auto& keyAndValue) {
+ return !validStreams.contains(keyAndValue.key);
+ });
</ins><span class="cx">
</span><span class="cx"> m_player->mediaEngineUpdated();
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> bool MediaPlayerPrivateGStreamer::hasFirstVideoSampleReachedSink() const
</span><span class="cx"> {
</span><span class="cx"> Locker sampleLocker { m_sampleMutex };
</span><span class="lines">@@ -1060,127 +1094,17 @@
</span><span class="cx"> void MediaPlayerPrivateGStreamer::audioChangedCallback(MediaPlayerPrivateGStreamer* player)
</span><span class="cx"> {
</span><span class="cx"> player->m_notifier->notify(MainThreadNotification::AudioChanged, [player] {
</span><del>- player->notifyPlayerOfAudio();
</del><ins>+ player->notifyPlayerOfTrack<AudioTrackPrivateGStreamer>();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamer::notifyPlayerOfAudio()
-{
- if (UNLIKELY(!m_pipeline || !m_source))
- return;
-
- ASSERT(m_isLegacyPlaybin || isMediaSource());
-
- // Ignore notifications after a EOS. We don't want the tracks to disappear when the video is finished.
- if (m_isEndReached)
- return;
-
- unsigned numTracks = 0;
- bool useMediaSource = isMediaSource();
- GstElement* element = useMediaSource ? m_source.get() : m_pipeline.get();
- g_object_get(element, "n-audio", &numTracks, nullptr);
-
- GST_INFO_OBJECT(pipeline(), "Media has %d audio tracks", numTracks);
- bool oldHasAudio = m_hasAudio;
- m_hasAudio = numTracks > 0;
- if (oldHasAudio != m_hasAudio)
- m_player->characteristicChanged();
-
- if (useMediaSource) {
- GST_DEBUG_OBJECT(pipeline(), "Tracks managed by source element. Bailing out now.");
- m_player->mediaEngineUpdated();
- return;
- }
-
- Vector<String> validAudioStreams;
- for (unsigned i = 0; i < numTracks; ++i) {
- GRefPtr<GstPad> pad;
- g_signal_emit_by_name(m_pipeline.get(), "get-audio-pad", i, &pad.outPtr(), nullptr);
- ASSERT(pad);
-
- String streamId = "A" + String::number(i);
- validAudioStreams.append(streamId);
- if (i < m_audioTracks.size()) {
- RefPtr<AudioTrackPrivateGStreamer> existingTrack = m_audioTracks.get(streamId);
- if (existingTrack) {
- existingTrack->setIndex(i);
- // If the video has been played twice, the track is still there, but we need
- // to update the pad pointer.
- if (existingTrack->pad() != pad)
- existingTrack->setPad(GRefPtr(pad));
- continue;
- }
- }
-
- auto track = AudioTrackPrivateGStreamer::create(makeWeakPtr(*this), i, pad);
- if (!track->trackIndex())
- track->setActive(true);
- ASSERT(streamId == track->id());
- m_audioTracks.add(streamId, track.copyRef());
- m_player->addAudioTrack(track.get());
- }
-
- purgeInvalidAudioTracks(validAudioStreams);
-
- m_player->mediaEngineUpdated();
-}
-
</del><span class="cx"> void MediaPlayerPrivateGStreamer::textChangedCallback(MediaPlayerPrivateGStreamer* player)
</span><span class="cx"> {
</span><span class="cx"> player->m_notifier->notify(MainThreadNotification::TextChanged, [player] {
</span><del>- player->notifyPlayerOfText();
</del><ins>+ player->notifyPlayerOfTrack<InbandTextTrackPrivateGStreamer>();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamer::notifyPlayerOfText()
-{
- if (UNLIKELY(!m_pipeline || !m_source))
- return;
-
- ASSERT(m_isLegacyPlaybin || isMediaSource());
-
- unsigned numTracks = 0;
- bool useMediaSource = isMediaSource();
- GstElement* element = useMediaSource ? m_source.get() : m_pipeline.get();
- g_object_get(element, "n-text", &numTracks, nullptr);
-
- GST_INFO_OBJECT(pipeline(), "Media has %d text tracks", numTracks);
-
- if (useMediaSource) {
- GST_DEBUG_OBJECT(pipeline(), "Tracks managed by source element. Bailing out now.");
- return;
- }
-
- Vector<String> validTextStreams;
- for (unsigned i = 0; i < numTracks; ++i) {
- GRefPtr<GstPad> pad;
- g_signal_emit_by_name(m_pipeline.get(), "get-text-pad", i, &pad.outPtr(), nullptr);
- ASSERT(pad);
-
- // We can't assume the pad has a sticky event here like implemented in
- // InbandTextTrackPrivateGStreamer because it might be emitted after the
- // track was created. So fallback to a dummy stream ID like in the Audio
- // and Video tracks.
- String streamId = "T" + String::number(i);
-
- validTextStreams.append(streamId);
- if (i < m_textTracks.size()) {
- RefPtr<InbandTextTrackPrivateGStreamer> existingTrack = m_textTracks.get(streamId);
- if (existingTrack) {
- existingTrack->setIndex(i);
- if (existingTrack->pad() == pad)
- continue;
- }
- }
-
- auto track = InbandTextTrackPrivateGStreamer::create(i, pad);
- m_textTracks.add(streamId, track.copyRef());
- m_player->addTextTrack(track.get());
- }
-
- purgeInvalidTextTracks(validTextStreams);
-}
-
</del><span class="cx"> void MediaPlayerPrivateGStreamer::handleTextSample(GstSample* sample, const char* streamId)
</span><span class="cx"> {
</span><span class="cx"> for (auto& track : m_textTracks.values()) {
</span><span class="lines">@@ -1538,7 +1462,7 @@
</span><span class="cx"> void MediaPlayerPrivateGStreamer::videoChangedCallback(MediaPlayerPrivateGStreamer* player)
</span><span class="cx"> {
</span><span class="cx"> player->m_notifier->notify(MainThreadNotification::VideoChanged, [player] {
</span><del>- player->notifyPlayerOfVideo();
</del><ins>+ player->notifyPlayerOfTrack<VideoTrackPrivateGStreamer>();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2153,27 +2077,6 @@
</span><span class="cx"> processTableOfContentsEntry(static_cast<GstTocEntry*>(i->data));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamer::purgeInvalidAudioTracks(Vector<String> validTrackIds)
-{
- m_audioTracks.removeIf([validTrackIds](auto& keyAndValue) {
- return !validTrackIds.contains(keyAndValue.key);
- });
-}
-
-void MediaPlayerPrivateGStreamer::purgeInvalidVideoTracks(Vector<String> validTrackIds)
-{
- m_videoTracks.removeIf([validTrackIds](auto& keyAndValue) {
- return !validTrackIds.contains(keyAndValue.key);
- });
-}
-
-void MediaPlayerPrivateGStreamer::purgeInvalidTextTracks(Vector<String> validTrackIds)
-{
- m_textTracks.removeIf([validTrackIds](auto& keyAndValue) {
- return !validTrackIds.contains(keyAndValue.key);
- });
-}
-
</del><span class="cx"> void MediaPlayerPrivateGStreamer::uriDecodeBinElementAddedCallback(GstBin* bin, GstElement* element, MediaPlayerPrivateGStreamer* player)
</span><span class="cx"> {
</span><span class="cx"> if (g_strcmp0(G_OBJECT_TYPE_NAME(element), "GstDownloadBuffer"))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (278977 => 278978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2021-06-17 08:38:46 UTC (rev 278977)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2021-06-17 09:18:02 UTC (rev 278978)
</span><span class="lines">@@ -298,9 +298,7 @@
</span><span class="cx">
</span><span class="cx"> void readyTimerFired();
</span><span class="cx">
</span><del>- void notifyPlayerOfVideo();
- void notifyPlayerOfAudio();
- void notifyPlayerOfText();
</del><ins>+ template <typename TrackPrivateType> void notifyPlayerOfTrack();
</ins><span class="cx">
</span><span class="cx"> void ensureAudioSourceProvider();
</span><span class="cx"> void setAudioStreamProperties(GObject*);
</span><span class="lines">@@ -459,10 +457,6 @@
</span><span class="cx"> void processTableOfContents(GstMessage*);
</span><span class="cx"> void processTableOfContentsEntry(GstTocEntry*);
</span><span class="cx">
</span><del>- void purgeInvalidAudioTracks(Vector<String> validTrackIds);
- void purgeInvalidVideoTracks(Vector<String> validTrackIds);
- void purgeInvalidTextTracks(Vector<String> validTrackIds);
-
</del><span class="cx"> String engineDescription() const override { return "GStreamer"; }
</span><span class="cx"> bool didPassCORSAccessCheck() const override;
</span><span class="cx"> bool canSaveMediaData() const override;
</span></span></pre>
</div>
</div>
</body>
</html>