Changeset 231351 in webkit

Timestamp:

May 4, 2018 6:26:13 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[MSE][GStreamer] Delete properly the stream from the WebKitMediaSource
​https://bugs.webkit.org/show_bug.cgi?id=185242

Patch by Yacine Bandou <​yacine.bandou_ext@softathome.com> on 2018-05-04
Reviewed by Xabier Rodriguez-Calvar.

When the sourceBuffer is removed from mediasource, the appropriate stream is not
properly deleted from WebKitMediaSource, because the appsrc and parser elements
of the stream are not removed from the WebKitMediaSource bin.

This patch avoids the regression of r231089, see ​https://bugs.webkit.org/show_bug.cgi?id=185071

• platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:

(webKitMediaSrcFreeStream):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-04  Yacine Bandou  <yacine.bandou_ext@softathome.com>
+
+        [MSE][GStreamer] Delete properly the stream from the WebKitMediaSource
+        https://bugs.webkit.org/show_bug.cgi?id=185242
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        When the sourceBuffer is removed from mediasource, the appropriate stream is not
+        properly deleted from WebKitMediaSource, because the appsrc and parser elements
+        of the stream are not removed from the WebKitMediaSource bin.
+
+        This patch avoids the regression of r231089, see https://bugs.webkit.org/show_bug.cgi?id=185071
+
+        * platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
+        (webKitMediaSrcFreeStream):
+
 2018-05-04  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp

@@ -514 +514 @@
         gst_app_src_set_callbacks(GST_APP_SRC(stream->appsrc), &disabledAppsrcCallbacks, nullptr, nullptr);
         gst_app_src_end_of_stream(GST_APP_SRC(stream->appsrc));
-    }
+        gst_element_set_state(stream->appsrc, GST_STATE_NULL);
+        gst_bin_remove(GST_BIN(source), stream->appsrc);
+        stream->appsrc = nullptr;
+    }
+
+    if (stream->parser) {
+        gst_element_set_state(stream->parser, GST_STATE_NULL);
+        gst_bin_remove(GST_BIN(source), stream->parser);
+        stream->parser = nullptr;
+    }
+
+    GST_OBJECT_LOCK(source);
+    switch (stream->type) {
+    case WebCore::Audio:
+        source->priv->numberOfAudioStreams--;
+        break;
+    case WebCore::Video:
+        source->priv->numberOfVideoStreams--;
+        break;
+    case WebCore::Text:
+        source->priv->numberOfTextStreams--;
+        break;
+    default:
+        break;
+    }
+    GST_OBJECT_UNLOCK(source);
 
     if (stream->type != WebCore::Invalid) {