Changeset 240784 in webkit

Timestamp:

Jan 31, 2019, 6:54:52 AM (8 years ago)

Author:

aboya@igalia.com

Message:

[MSE][GStreamer] Remove unused GstFlowReturn in AppendPipeline methods
​https://bugs.webkit.org/show_bug.cgi?id=194067

Reviewed by Xabier Rodriguez-Calvar.

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/mse/AppendPipeline.cpp (modified) (4 diffs)
• platform/graphics/gstreamer/mse/AppendPipeline.h (modified) (2 diffs)
• platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp (modified) (3 diffs)
• platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h (modified) (1 diff)
• platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-31  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 Xabier Rodriguez-Calvar.
+
+        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-31  Alicia Boya García  <aboya@igalia.com>
 

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

@@ -553 +553 @@
 }
 
-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());
@@ -559 +559 @@
     // 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.
@@ -575 +578 @@
     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;
-}
-
-GstFlowReturn AppendPipeline::handleAppsinkNewSampleFromStreamingThread(GstElement*)
+    if (pushEndOfAppendBufferRet != GST_FLOW_OK) {
+        GST_ERROR_OBJECT(m_pipeline.get(), "Failed to push end-of-append buffer into appsrc.");
+        ASSERT_NOT_REACHED();
+    }
+}
+
+void AppendPipeline::handleAppsinkNewSampleFromStreamingThread(GstElement*)
 {
     ASSERT(!isMainThread());
@@ -601 +605 @@
         });
     }
-
-    return GST_FLOW_OK;
 }
 

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

@@ -50 +50 @@
     virtual ~AppendPipeline();
 
-    GstFlowReturn pushNewBuffer(GRefPtr<GstBuffer>&&);
+    void pushNewBuffer(GRefPtr<GstBuffer>&&);
     void resetParserState();
     Ref<SourceBufferPrivateGStreamer> sourceBufferPrivate() { return m_sourceBufferPrivate.get(); }
@@ -66 +66 @@
     gint id();
 
-    GstFlowReturn handleAppsinkNewSampleFromStreamingThread(GstElement*);
+    void handleAppsinkNewSampleFromStreamingThread(GstElement*);
 
     // Takes ownership of caps.

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

@@ -116 +116 @@
 }
 
-bool MediaSourceClientGStreamerMSE::append(RefPtr<SourceBufferPrivateGStreamer> sourceBufferPrivate, Vector<unsigned char>&& data)
+void MediaSourceClientGStreamerMSE::append(RefPtr<SourceBufferPrivateGStreamer> sourceBufferPrivate, Vector<unsigned char>&& data)
 {
     ASSERT(WTF::isMainThread());
@@ -122 +122 @@
     GST_DEBUG("Appending %zu bytes", data.size());
 
-    if (!m_playerPrivate)
-        return false;
+    ASSERT(m_playerPrivate);
 
     RefPtr<AppendPipeline> appendPipeline = m_playerPrivate->m_appendPipelinesMap.get(sourceBufferPrivate);
@@ -138 +137 @@
         }));
 
-    return appendPipeline->pushNewBuffer(WTFMove(buffer)) == GST_FLOW_OK;
+    appendPipeline->pushNewBuffer(WTFMove(buffer));
 }
 

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

@@ -49 +49 @@
     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);

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

@@ -74 +74 @@
         return;
 
-    if (m_client->append(this, WTFMove(data)))
-        return;
-
+    m_client->append(this, WTFMove(data));
     m_sourceBufferPrivateClient->sourceBufferPrivateAppendComplete(SourceBufferPrivateClient::ReadStreamFailed);
 }