Changeset 228868 in webkit

Timestamp:

Feb 21, 2018 3:42:05 AM (6 years ago)

Author:

Philippe Normand

Message:

[GTK] Layout test media/track/track-in-band-duplicate-tracks-when-source-changes.html failing since r228617
​https://bugs.webkit.org/show_bug.cgi?id=160131
<rdar://problem/35873985>

Reviewed by Michael Catanzaro.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText): 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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-20  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] Layout test media/track/track-in-band-duplicate-tracks-when-source-changes.html failing since r228617
+        https://bugs.webkit.org/show_bug.cgi?id=160131
+        <rdar://problem/35873985>
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfText): 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.
+
 2018-02-20  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -925 +925 @@
     g_object_get(element, "n-text", &numTracks, nullptr);
 
+    GST_INFO("Media has %d text tracks", numTracks);
+
     if (useMediaSource) {
         GST_DEBUG("Tracks managed by source element. Bailing out now.");
@@ -936 +938 @@
         ASSERT(pad);
 
-        GRefPtr<GstEvent> event = adoptGRef(gst_pad_get_sticky_event(pad.get(), GST_EVENT_STREAM_START, 0));
-        if (!event)
-            continue;
-
-        const char* streamId;
-        gst_event_parse_stream_start(event.get(), &streamId);
+        // 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);