<!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>[269839] 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/269839">269839</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2020-11-16 01:27:23 -0800 (Mon, 16 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GStreamer] Switch the ImageDecoder to decodebin3
https://bugs.webkit.org/show_bug.cgi?id=218246

Reviewed by Xabier Rodriguez-Calvar.

Rely on the decodebin3 select-stream to ensure that at most one video stream is selected for
decoding. Thus we don't need to plug a fakesink to streams we don't need anymore.

* platform/graphics/gstreamer/ImageDecoderGStreamer.cpp:
(WebCore::ImageDecoderGStreamer::InnerDecoder::decodebinSelectStreamCallback):
(WebCore::ImageDecoderGStreamer::InnerDecoder::selectStream):
(WebCore::ImageDecoderGStreamer::InnerDecoder::connectDecoderPad):
(WebCore::ImageDecoderGStreamer::InnerDecoder::preparePipeline):
* platform/graphics/gstreamer/ImageDecoderGStreamer.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerImageDecoderGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerImageDecoderGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (269838 => 269839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-16 08:27:09 UTC (rev 269838)
+++ trunk/Source/WebCore/ChangeLog      2020-11-16 09:27:23 UTC (rev 269839)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2020-11-16  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] Switch the ImageDecoder to decodebin3
+        https://bugs.webkit.org/show_bug.cgi?id=218246
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Rely on the decodebin3 select-stream to ensure that at most one video stream is selected for
+        decoding. Thus we don't need to plug a fakesink to streams we don't need anymore.
+
+        * platform/graphics/gstreamer/ImageDecoderGStreamer.cpp:
+        (WebCore::ImageDecoderGStreamer::InnerDecoder::decodebinSelectStreamCallback):
+        (WebCore::ImageDecoderGStreamer::InnerDecoder::selectStream):
+        (WebCore::ImageDecoderGStreamer::InnerDecoder::connectDecoderPad):
+        (WebCore::ImageDecoderGStreamer::InnerDecoder::preparePipeline):
+        * platform/graphics/gstreamer/ImageDecoderGStreamer.h:
+
</ins><span class="cx"> 2020-11-16  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [WinCairo][GraphicsLayerTextureMapper] Support rounded rect clipping for backdrop-filter
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerImageDecoderGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp (269838 => 269839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp       2020-11-16 08:27:09 UTC (rev 269838)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp  2020-11-16 09:27:23 UTC (rev 269839)
</span><span class="lines">@@ -223,6 +223,24 @@
</span><span class="cx">     return toSample(iter);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+int ImageDecoderGStreamer::InnerDecoder::selectStream(GstStream* stream)
+{
+    // Select only the first video stream.
+    auto* object = GST_OBJECT_CAST(m_decodebin.get());
+    GST_OBJECT_LOCK(object);
+    auto numberOfSourcePads = m_decodebin->numsrcpads;
+    GST_OBJECT_UNLOCK(object);
+
+    if (numberOfSourcePads) {
+        GST_DEBUG_OBJECT(m_pipeline.get(), "Discarding additional %" GST_PTR_FORMAT, stream);
+        return 0;
+    }
+
+    int result = gst_stream_get_stream_type(stream) & GST_STREAM_TYPE_VIDEO ? 1 : 0;
+    GST_DEBUG_OBJECT(m_pipeline.get(), "%" GST_PTR_FORMAT " selected: %s", stream, boolForPrinting(result));
+    return result;
+}
+
</ins><span class="cx"> void ImageDecoderGStreamer::InnerDecoder::decodebinPadAddedCallback(ImageDecoderGStreamer::InnerDecoder* decoder, GstPad* pad)
</span><span class="cx"> {
</span><span class="cx">     decoder->connectDecoderPad(pad);
</span><span class="lines">@@ -230,19 +248,10 @@
</span><span class="cx"> 
</span><span class="cx"> void ImageDecoderGStreamer::InnerDecoder::connectDecoderPad(GstPad* pad)
</span><span class="cx"> {
</span><del>-    auto padCaps = adoptGRef(gst_pad_get_current_caps(pad));
</del><ins>+    auto padCaps = adoptGRef(gst_pad_query_caps(pad, nullptr));
</ins><span class="cx">     GST_DEBUG_OBJECT(m_pipeline.get(), "New decodebin pad %" GST_PTR_FORMAT " caps: %" GST_PTR_FORMAT, pad, padCaps.get());
</span><ins>+    RELEASE_ASSERT(doCapsHaveType(padCaps.get(), "video"));
</ins><span class="cx"> 
</span><del>-    if (!doCapsHaveType(padCaps.get(), "video")) {
-        GST_DEBUG_OBJECT(m_pipeline.get(), "Non-video pad, plugging to a fakesink");
-        auto* sink = gst_element_factory_make("fakesink", nullptr);
-        gst_bin_add(GST_BIN_CAST(m_pipeline.get()), sink);
-        auto sinkPad = adoptGRef(gst_element_get_static_pad(sink, "sink"));
-        gst_pad_link(pad, sinkPad.get());
-        gst_element_sync_state_with_parent(sink);
-        return;
-    }
-
</del><span class="cx">     GstElement* sink = gst_element_factory_make("appsink", nullptr);
</span><span class="cx">     static GstAppSinkCallbacks callbacks = {
</span><span class="cx">         nullptr,
</span><span class="lines">@@ -352,11 +361,14 @@
</span><span class="cx">     GstElement* source = gst_element_factory_make("giostreamsrc", nullptr);
</span><span class="cx">     g_object_set(source, "stream", m_memoryStream.get(), nullptr);
</span><span class="cx"> 
</span><del>-    GstElement* decoder = gst_element_factory_make("decodebin", nullptr);
-    g_signal_connect_swapped(decoder, "pad-added", G_CALLBACK(decodebinPadAddedCallback), this);
</del><ins>+    m_decodebin = gst_element_factory_make("decodebin3", nullptr);
+    g_signal_connect(m_decodebin.get(), "select-stream", G_CALLBACK(+[](GstElement*, GstStreamCollection*, GstStream* stream, ImageDecoderGStreamer::InnerDecoder* decoder) -> int {
+        return decoder->selectStream(stream);
+    }), this);
+    g_signal_connect_swapped(m_decodebin.get(), "pad-added", G_CALLBACK(decodebinPadAddedCallback), this);
</ins><span class="cx"> 
</span><del>-    gst_bin_add_many(GST_BIN_CAST(m_pipeline.get()), source, decoder, nullptr);
-    gst_element_link(source, decoder);
</del><ins>+    gst_bin_add_many(GST_BIN_CAST(m_pipeline.get()), source, m_decodebin.get(), nullptr);
+    gst_element_link(source, m_decodebin.get());
</ins><span class="cx">     gst_element_set_state(m_pipeline.get(), GST_STATE_PLAYING);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerImageDecoderGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.h (269838 => 269839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.h 2020-11-16 08:27:09 UTC (rev 269838)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.h    2020-11-16 09:27:23 UTC (rev 269839)
</span><span class="lines">@@ -106,11 +106,13 @@
</span><span class="cx">         static void decodebinPadAddedCallback(ImageDecoderGStreamer::InnerDecoder*, GstPad*);
</span><span class="cx">         void handleMessage(GstMessage*);
</span><span class="cx">         void preparePipeline();
</span><ins>+        int selectStream(GstStream*);
</ins><span class="cx">         void connectDecoderPad(GstPad*);
</span><span class="cx"> 
</span><span class="cx">         ImageDecoderGStreamer& m_decoder;
</span><span class="cx">         GRefPtr<GstElement> m_pipeline;
</span><span class="cx">         GRefPtr<GInputStream> m_memoryStream;
</span><ins>+        GRefPtr<GstElement> m_decodebin;
</ins><span class="cx">         RunLoop& m_runLoop;
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>