Changeset 233797 in webkit

Timestamp:

Jul 13, 2018 3:47:10 AM (6 years ago)

Author:

calvaris@igalia.com

Message:

[GStreamer][MSE] Add GstFlowCombiner to handle non-linked inactive branches
​https://bugs.webkit.org/show_bug.cgi?id=187636

Reviewed by Carlos Garcia Campos.

When we have more than one source buffer, only one will be
rendered and the inactive branch will report linking errors that
we have to deal with.

• platform/graphics/gstreamer/GUniquePtrGStreamer.h: Added GstFlowCombiner.
• platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:

(webkitMediaSrcChain): Combine the flow in the flow combiner.
(webkit_media_src_init): Initialize the flow combiner.
(webKitMediaSrcLinkStreamToSrcPad): Add the proxypad to the
combiner and set the chain function.

• platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamerPrivate.h:

Declare the flow combiner.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GUniquePtrGStreamer.h (modified) (2 diffs)
• platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp (modified) (4 diffs)
• platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamerPrivate.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-13  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [GStreamer][MSE] Add GstFlowCombiner to handle non-linked inactive branches
+        https://bugs.webkit.org/show_bug.cgi?id=187636
+
+        Reviewed by Carlos Garcia Campos.
+
+        When we have more than one source buffer, only one will be
+        rendered and the inactive branch will report linking errors that
+        we have to deal with.
+
+        * platform/graphics/gstreamer/GUniquePtrGStreamer.h: Added GstFlowCombiner.
+        * platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamer.cpp:
+        (webkitMediaSrcChain): Combine the flow in the flow combiner.
+        (webkit_media_src_init): Initialize the flow combiner.
+        (webKitMediaSrcLinkStreamToSrcPad): Add the proxypad to the
+        combiner and set the chain function.
+        * platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamerPrivate.h:
+        Declare the flow combiner.
+
 2018-07-13  Charlie Turner  <cturner@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h

@@ -22 +22 @@
 #if USE(GSTREAMER)
 
+#include <gst/base/gstflowcombiner.h>
 #include <gst/gstsegment.h>
 #include <gst/gststructure.h>
@@ -32 +33 @@
 WTF_DEFINE_GPTR_DELETER(GstInstallPluginsContext, gst_install_plugins_context_free)
 WTF_DEFINE_GPTR_DELETER(GstSegment, gst_segment_free)
+WTF_DEFINE_GPTR_DELETER(GstFlowCombiner, gst_flow_combiner_free)
 
 }

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

@@ -49 +49 @@
 #include <wtf/Condition.h>
 #include <wtf/MainThread.h>
-#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
@@ -250 +249 @@
 }
 
+static GstFlowReturn webkitMediaSrcChain(GstPad* pad, GstObject* parent, GstBuffer* buffer)
+{
+    GRefPtr<WebKitMediaSrc> self = adoptGRef(WEBKIT_MEDIA_SRC(gst_object_get_parent(parent)));
+
+    return gst_flow_combiner_update_pad_flow(self->priv->flowCombiner.get(), pad, gst_proxy_pad_chain_default(pad, GST_OBJECT(self.get()), buffer));
+}
+
 static void webkit_media_src_init(WebKitMediaSrc* source)
 {
@@ -258 +264 @@
     source->priv->appsrcNeedDataCount = 0;
     source->priv->appsrcSeekDataNextAction = Nothing;
+    source->priv->flowCombiner = GUniquePtr<GstFlowCombiner>(gst_flow_combiner_new());
 
     // No need to reset Stream.appsrcNeedDataFlag because there are no Streams at this point yet.
@@ -475 +482 @@
     GstPad* ghostpad = WebCore::webkitGstGhostPadFromStaticTemplate(&srcTemplate, padName.get(), sourcePad);
 
+    auto proxypad = adoptGRef(GST_PAD(gst_proxy_pad_get_internal(GST_PROXY_PAD(ghostpad))));
+    gst_flow_combiner_add_pad(stream->parent->priv->flowCombiner.get(), proxypad.get());
+    gst_pad_set_chain_function(proxypad.get(), static_cast<GstPadChainFunction>(webkitMediaSrcChain));
     gst_pad_set_query_function(ghostpad, webKitMediaSrcQueryWithParent);
 

trunk/Source/WebCore/platform/graphics/gstreamer/mse/WebKitMediaSourceGStreamerPrivate.h

@@ -24 +24 @@
 
 #include "AudioTrackPrivateGStreamer.h"
+#include "GUniquePtrGStreamer.h"
 #include "SourceBufferPrivateGStreamer.h"
 #include "VideoTrackPrivateGStreamer.h"
@@ -122 +123 @@
     GRefPtr<GstBus> bus;
     WebCore::MediaPlayerPrivateGStreamerMSE* mediaPlayerPrivate;
+
+    GUniquePtr<GstFlowCombiner> flowCombiner;
 };