Diff
Modified: trunk/Source/WebCore/ChangeLog (240783 => 240784)
--- trunk/Source/WebCore/ChangeLog 2019-01-31 14:52:44 UTC (rev 240783)
+++ trunk/Source/WebCore/ChangeLog 2019-01-31 14:54:52 UTC (rev 240784)
@@ -1,5 +1,28 @@
2019-01-31 Alicia Boya García <ab...@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 <ab...@igalia.com>
+
[MSE][GStreamer] Remove if (m_playerPrivate) from MediaSourceClientGStreamerMSE
https://bugs.webkit.org/show_bug.cgi?id=194069
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp (240783 => 240784)
--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2019-01-31 14:52:44 UTC (rev 240783)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp 2019-01-31 14:54:52 UTC (rev 240784)
@@ -552,13 +552,16 @@
#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 @@
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 @@
consumeAppsinkAvailableSamples();
});
}
-
- return GST_FLOW_OK;
}
static GRefPtr<GstElement>
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h (240783 => 240784)
--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h 2019-01-31 14:52:44 UTC (rev 240783)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.h 2019-01-31 14:54:52 UTC (rev 240784)
@@ -49,7 +49,7 @@
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 @@
gint id();
- GstFlowReturn handleAppsinkNewSampleFromStreamingThread(GstElement*);
+ void handleAppsinkNewSampleFromStreamingThread(GstElement*);
// Takes ownership of caps.
void parseDemuxerSrcPadCaps(GstCaps*);
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp (240783 => 240784)
--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp 2019-01-31 14:52:44 UTC (rev 240783)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.cpp 2019-01-31 14:54:52 UTC (rev 240784)
@@ -115,14 +115,13 @@
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);
@@ -137,7 +136,7 @@
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)
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h (240783 => 240784)
--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h 2019-01-31 14:52:44 UTC (rev 240783)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/MediaSourceClientGStreamerMSE.h 2019-01-31 14:54:52 UTC (rev 240784)
@@ -48,7 +48,7 @@
// 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>&&);
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp (240783 => 240784)
--- trunk/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp 2019-01-31 14:52:44 UTC (rev 240783)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp 2019-01-31 14:54:52 UTC (rev 240784)
@@ -73,9 +73,7 @@
if (!m_sourceBufferPrivateClient)
return;
- if (m_client->append(this, WTFMove(data)))
- return;
-
+ m_client->append(this, WTFMove(data));
m_sourceBufferPrivateClient->sourceBufferPrivateAppendComplete(SourceBufferPrivateClient::ReadStreamFailed);
}
