Changeset 276701 in webkit

Timestamp:

Apr 28, 2021, 2:36:43 AM (5 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r275821 - [MSE][GStreamer] Crash in WebCore::PlaybackPipeline::addSourceBuffer when setting duration and preload is set to none
​https://bugs.webkit.org/show_bug.cgi?id=224260

Patch by Philippe Normand <​pnormand@igalia.com> on 2021-04-12
Reviewed by Xabier Rodriguez-Calvar.

Source/WebCore:

Disable delayed loading for the GStreamer MSE player, we want the MSE source element to be
configured ASAP, otherwise the playback pipeline will fail in various ways (duration
notifications sent too early, crashes in addSourceBuffer, crashes in attachTracks, and so
on).

Test: media/media-source/media-source-no-preload-set-duration-crash.html

• platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:

(WebCore::MediaPlayerPrivateGStreamerMSE::durationChanged):

LayoutTests:

• media/media-source/media-source-no-preload-set-duration-crash-expected.txt: Added.
• media/media-source/media-source-no-preload-set-duration-crash.html: Added.

Location:

releases/WebKitGTK/webkit-2.32

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-source/media-source-no-preload-set-duration-crash-expected.txt (added)
• LayoutTests/media/media-source/media-source-no-preload-set-duration-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog

@@ +1 @@
+2021-04-12  Philippe Normand  <pnormand@igalia.com>
+
+        [MSE][GStreamer] Crash in WebCore::PlaybackPipeline::addSourceBuffer when setting duration and preload is set to none
+        https://bugs.webkit.org/show_bug.cgi?id=224260
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        * media/media-source/media-source-no-preload-set-duration-crash-expected.txt: Added.
+        * media/media-source/media-source-no-preload-set-duration-crash.html: Added.
+
 2021-03-24  Philippe Normand  <pnormand@igalia.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-12  Philippe Normand  <pnormand@igalia.com>
+
+        [MSE][GStreamer] Crash in WebCore::PlaybackPipeline::addSourceBuffer when setting duration and preload is set to none
+        https://bugs.webkit.org/show_bug.cgi?id=224260
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Disable delayed loading for the GStreamer MSE player, we want the MSE source element to be
+        configured ASAP, otherwise the playback pipeline will fail in various ways (duration
+        notifications sent too early, crashes in addSourceBuffer, crashes in attachTracks, and so
+        on).
+
+        Test: media/media-source/media-source-no-preload-set-duration-crash.html
+
+        * platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:
+        (WebCore::MediaPlayerPrivateGStreamerMSE::durationChanged):
+
 2021-04-16  Adrian Perez de Castro  <aperez@igalia.com>
 

releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -357 +357 @@
 
     GST_DEBUG_OBJECT(pipeline(), "preload: %s", convertEnumerationToString(m_preload).utf8().data());
-    if (m_preload == MediaPlayer::Preload::None) {
+    if (m_preload == MediaPlayer::Preload::None && !isMediaSource()) {
         GST_INFO_OBJECT(pipeline(), "Delaying load.");
         m_isDelayingLoad = true;

releases/WebKitGTK/webkit-2.32/Source/WebCore/platform/graphics/gstreamer/mse/PlaybackPipeline.cpp

@@ -104 +104 @@
 MediaSourcePrivate::AddStatus PlaybackPipeline::addSourceBuffer(RefPtr<SourceBufferPrivateGStreamer> sourceBufferPrivate)
 {
+    ASSERT(m_webKitMediaSrc);
     WebKitMediaSrcPrivate* priv = m_webKitMediaSrc->priv;
 
@@ -259 +260 @@
 void PlaybackPipeline::notifyDurationChanged()
 {
+    ASSERT(m_webKitMediaSrc);
     gst_element_post_message(GST_ELEMENT(m_webKitMediaSrc.get()), gst_message_new_duration_changed(GST_OBJECT(m_webKitMediaSrc.get())));
     // WebKitMediaSrc will ask MediaPlayerPrivateGStreamerMSE for the new duration later, when somebody asks for it.