Attachment 360656 Details for Bug 194067 – Patch

[patch] Patch

bug-194067-20190131021715.patch (text/plain), 8.23 KB, created by Alicia Boya García on 2019-01-30 17:17:17 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alicia Boya García

Created: 2019-01-30 17:17:17 PST

Size: 8.23 KB

patch

obsolete

>Subversion Revision: 240726
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0c2aef2bf0cf50d3a3a6b62ef94e4e9e2f422909..d77026b2677b760940371273f2fe8a6dab375522 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,26 @@
>+2019-01-17  Alicia Boya GarcÃa  <aboya@igalia.com>
>+
>+        [MSE][GStreamer] Remove unused GstFlowReturn in AppendPipeline methods
>+        https://bugs.webkit.org/show_bug.cgi?id=194067
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        A couple methods in AppendPipeline were returning GstFlowReturn
>+        despite there being no codepath (sans assertions) where values other
>+        than GST_FLOW_OK are returned.
>+
>+        Therefore, it makes sense to just make these methods return void.
>+
>+        * platform/graphics/gstreamer/mse/AppendPipeline.cpp:
>+        (WebCore::AppendPipeline::pushNewBuffer):
>+        (WebCore::AppendPipeline::handleAppsinkNewSampleFromStreamingThread):
>+        * platform/graphics/gstreamer/mse/AppendPipeline.h:
>+        * platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp:
>+        (WebCore::MediaSourceClientGStreamerMSE::append):
>+        * platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h:
>+        * platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp:
>+        (WebCore::SourceBufferPrivateGStreamer::append):
>+
> 2019-01-30  Dean Jackson  <dino@apple.com>
> 
>         PointerEvents - tiltX and tiltY are reversed
>diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp
>index 4340b9c4a09aec7199d02d6488a3ed54c85baa51..5067cf3272fa3afda30c2fd403fd980062d7b88e 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp
>@@ -552,13 +552,16 @@ void AppendPipeline::resetParserState()
> #endif
> }
> 
>-GstFlowReturn AppendPipeline::pushNewBuffer(GRefPtr<GstBuffer>&& buffer)
>+void AppendPipeline::pushNewBuffer(GRefPtr<GstBuffer>&& buffer)
> {
>     GST_TRACE_OBJECT(m_pipeline.get(), "pushing data buffer %" GST_PTR_FORMAT, buffer.get());
>     GstFlowReturn pushDataBufferRet = gst_app_src_push_buffer(GST_APP_SRC(m_appsrc.get()), buffer.leakRef());
>     // Pushing buffers to appsrc can only fail if the appsrc is flushing, in EOS or stopped. Neither of these should
>     // be true at this point.
>-    g_return_val_if_fail(pushDataBufferRet == GST_FLOW_OK, GST_FLOW_ERROR);
>+    if (pushDataBufferRet != GST_FLOW_OK) {
>+        GST_ERROR_OBJECT(m_pipeline.get(), "Failed to push data buffer into appsrc.");
>+        ASSERT_NOT_REACHED();
>+    }
> 
>     // Push an additional empty buffer that marks the end of the append.
>     // This buffer is detected and consumed by appsrcEndOfAppendCheckerProbe(), which uses it to signal the successful
>@@ -574,12 +577,13 @@ GstFlowReturn AppendPipeline::pushNewBuffer(GRefPtr<GstBuffer>&& buffer)
> 
>     GST_TRACE_OBJECT(m_pipeline.get(), "pushing end-of-append buffer %" GST_PTR_FORMAT, endOfAppendBuffer);
>     GstFlowReturn pushEndOfAppendBufferRet = gst_app_src_push_buffer(GST_APP_SRC(m_appsrc.get()), endOfAppendBuffer);
>-    g_return_val_if_fail(pushEndOfAppendBufferRet == GST_FLOW_OK, GST_FLOW_ERROR);
>-
>-    return GST_FLOW_OK;
>+    if (pushEndOfAppendBufferRet != GST_FLOW_OK) {
>+        GST_ERROR_OBJECT(m_pipeline.get(), "Failed to push end-of-append buffer into appsrc.");
>+        ASSERT_NOT_REACHED();
>+    }
> }
> 
>-GstFlowReturn AppendPipeline::handleAppsinkNewSampleFromStreamingThread(GstElement*)
>+void AppendPipeline::handleAppsinkNewSampleFromStreamingThread(GstElement*)
> {
>     ASSERT(!isMainThread());
>     if (&WTF::Thread::current() != m_streamingThread) {
>@@ -600,8 +604,6 @@ GstFlowReturn AppendPipeline::handleAppsinkNewSampleFromStreamingThread(GstEleme
>             consumeAppsinkAvailableSamples();
>         });
>     }
>-
>-    return GST_FLOW_OK;
> }
> 
> static GRefPtr<GstElement>
>diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h b/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h
>index d59598990f9ac2be11b7b6c88414828d1020c95d..00211a678816b3257cd84d9bbdfd0276f9f0df9d 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h
>+++ b/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h
>@@ -49,7 +49,7 @@ public:
>     AppendPipeline(Ref<MediaSourceClientGStreamerMSE>, Ref<SourceBufferPrivateGStreamer>, MediaPlayerPrivateGStreamerMSE&);
>     virtual ~AppendPipeline();
> 
>-    GstFlowReturn pushNewBuffer(GRefPtr<GstBuffer>&&);
>+    void pushNewBuffer(GRefPtr<GstBuffer>&&);
>     void resetParserState();
>     Ref<SourceBufferPrivateGStreamer> sourceBufferPrivate() { return m_sourceBufferPrivate.get(); }
>     GstCaps* appsinkCaps() { return m_appsinkCaps.get(); }
>@@ -65,7 +65,7 @@ private:
> 
>     gint id();
> 
>-    GstFlowReturn handleAppsinkNewSampleFromStreamingThread(GstElement*);
>+    void handleAppsinkNewSampleFromStreamingThread(GstElement*);
> 
>     // Takes ownership of caps.
>     void parseDemuxerSrcPadCaps(GstCaps*);
>diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp
>index b37adaef4336f2a5b8cc33649d845a61687db44b..194e921923d1a0714bf720357472e5730762eaf4 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp
>@@ -125,14 +125,13 @@ void MediaSourceClientGStreamerMSE::resetParserState(RefPtr<SourceBufferPrivateG
>     appendPipeline->resetParserState();
> }
> 
>-bool MediaSourceClientGStreamerMSE::append(RefPtr<SourceBufferPrivateGStreamer> sourceBufferPrivate, Vector<unsigned char>&& data)
>+void MediaSourceClientGStreamerMSE::append(RefPtr<SourceBufferPrivateGStreamer> sourceBufferPrivate, Vector<unsigned char>&& data)
> {
>     ASSERT(WTF::isMainThread());
> 
>     GST_DEBUG("Appending %zu bytes", data.size());
> 
>-    if (!m_playerPrivate)
>-        return false;
>+    ASSERT(m_playerPrivate);
> 
>     RefPtr<AppendPipeline> appendPipeline = m_playerPrivate->m_appendPipelinesMap.get(sourceBufferPrivate);
> 
>@@ -147,7 +146,7 @@ bool MediaSourceClientGStreamerMSE::append(RefPtr<SourceBufferPrivateGStreamer>
>             delete static_cast<Vector<unsigned char>*>(data);
>         }));
> 
>-    return appendPipeline->pushNewBuffer(WTFMove(buffer)) == GST_FLOW_OK;
>+    appendPipeline->pushNewBuffer(WTFMove(buffer));
> }
> 
> void MediaSourceClientGStreamerMSE::markEndOfStream(MediaSourcePrivate::EndOfStreamStatus status)
>diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h
>index 59af3f929490180ff91e9086032cc77d8ed2aac4..5b2c936840c027fee8be69dd4c8fa3bd2c0a9ef4 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h
>+++ b/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h
>@@ -48,7 +48,7 @@ public:
>     // From SourceBufferPrivateGStreamer.
>     void abort(RefPtr<SourceBufferPrivateGStreamer>);
>     void resetParserState(RefPtr<SourceBufferPrivateGStreamer>);
>-    bool append(RefPtr<SourceBufferPrivateGStreamer>, Vector<unsigned char>&&);
>+    void append(RefPtr<SourceBufferPrivateGStreamer>, Vector<unsigned char>&&);
>     void removedFromMediaSource(RefPtr<SourceBufferPrivateGStreamer>);
>     void flush(AtomicString);
>     void enqueueSample(Ref<MediaSample>&&);
>diff --git a/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
>index 4290edcc6ba788baa14c4e05870342bc6517ce01..8fc9ee0203ed4425762288dfc43f9917f63f6f73 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
>@@ -73,9 +73,7 @@ void SourceBufferPrivateGStreamer::append(Vector<unsigned char>&& data)
>     if (!m_sourceBufferPrivateClient)
>         return;
> 
>-    if (m_client->append(this, WTFMove(data)))
>-        return;
>-
>+    m_client->append(this, WTFMove(data));
>     m_sourceBufferPrivateClient->sourceBufferPrivateAppendComplete(SourceBufferPrivateClient::ReadStreamFailed);
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194067: 360656