Title: [279283] trunk/Source/WebCore
- Revision
- 279283
- Author
- [email protected]
- Date
- 2021-06-25 08:12:29 -0700 (Fri, 25 Jun 2021)
Log Message
[GStreamer] Build warnings in AudioFileReader since r279123
https://bugs.webkit.org/show_bug.cgi?id=227348
Patch by Philippe Normand <[email protected]> on 2021-06-25
Reviewed by Xabier Rodriguez-Calvar.
Simplify the code handling the giostreamsrc creation, now that it is the only option possible.
* platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
(WebCore::AudioFileReader::decodeAudioForBusCreation):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (279282 => 279283)
--- trunk/Source/WebCore/ChangeLog 2021-06-25 15:06:53 UTC (rev 279282)
+++ trunk/Source/WebCore/ChangeLog 2021-06-25 15:12:29 UTC (rev 279283)
@@ -1,3 +1,15 @@
+2021-06-25 Philippe Normand <[email protected]>
+
+ [GStreamer] Build warnings in AudioFileReader since r279123
+ https://bugs.webkit.org/show_bug.cgi?id=227348
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Simplify the code handling the giostreamsrc creation, now that it is the only option possible.
+
+ * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+ (WebCore::AudioFileReader::decodeAudioForBusCreation):
+
2021-06-25 Commit Queue <[email protected]>
Unreviewed, reverting r279266.
Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (279282 => 279283)
--- trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2021-06-25 15:06:53 UTC (rev 279282)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2021-06-25 15:12:29 UTC (rev 279283)
@@ -324,7 +324,7 @@
{
ASSERT(&m_runLoop == &RunLoop::current());
- // Build the pipeline (giostreamsrc | filesrc) ! decodebin
+ // Build the pipeline giostreamsrc ! decodebin
// A deinterleave element is added once a src pad becomes available in decodebin.
static Atomic<uint32_t> pipelineId;
m_pipeline = gst_pipeline_new(makeString("audio-file-reader-", pipelineId.exchangeAdd(1)).ascii().data());
@@ -347,13 +347,11 @@
return GST_BUS_DROP;
}, this, nullptr);
- GstElement* source;
- if (m_data) {
- ASSERT(m_dataSize);
- source = makeGStreamerElement("giostreamsrc", nullptr);
- GRefPtr<GInputStream> memoryStream = adoptGRef(g_memory_input_stream_new_from_data(m_data, m_dataSize, nullptr));
- g_object_set(source, "stream", memoryStream.get(), nullptr);
- }
+ ASSERT(m_data);
+ ASSERT(m_dataSize);
+ auto* source = makeGStreamerElement("giostreamsrc", nullptr);
+ auto memoryStream = adoptGRef(g_memory_input_stream_new_from_data(m_data, m_dataSize, nullptr));
+ g_object_set(source, "stream", memoryStream.get(), nullptr);
m_decodebin = makeGStreamerElement("decodebin", "decodebin");
g_signal_connect_swapped(m_decodebin.get(), "pad-added", G_CALLBACK(decodebinPadAddedCallback), this);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
