Changeset 288287 in webkit

Timestamp:

Jan 20, 2022 7:41:36 AM (2 years ago)

Author:

Adrian Perez de Castro

Message:

Merge r287410 - [GStreamer] MediaPlayerPrivateGStreamer mishandles failure to create WebKitTextCombiner
​https://bugs.webkit.org/show_bug.cgi?id=233230

Patch by Philippe Normand <​pnormand@igalia.com> on 2021-12-23
Reviewed by Michael Catanzaro.

Gracefully fail when the subenc plugin is not available. It is optional, we should not
assert or crash if it's not found. Two warnings are logged already when it's not found.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):

Location:

releases/WebKitGTK/webkit-2.34/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (1 diff)
• platform/graphics/gstreamer/TextCombinerGStreamer.cpp (modified) (1 diff)

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

@@ +1 @@
+2021-12-23  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer] MediaPlayerPrivateGStreamer mishandles failure to create WebKitTextCombiner
+        https://bugs.webkit.org/show_bug.cgi?id=233230
+
+        Reviewed by Michael Catanzaro.
+
+        Gracefully fail when the subenc plugin is not available. It is optional, we should not
+        assert or crash if it's not found. Two warnings are logged already when it's not found.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+
 2021-12-22  Frédéric Wang  <fwang@igalia.com>
 

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

@@ -2704 +2704 @@
         g_signal_connect_swapped(m_pipeline.get(), "text-changed", G_CALLBACK(textChangedCallback), this);
 
-    GstElement* textCombiner = webkitTextCombinerNew();
-    ASSERT(textCombiner);
-    g_object_set(m_pipeline.get(), "text-stream-combiner", textCombiner, nullptr);
+    if (auto* textCombiner = webkitTextCombinerNew())
+        g_object_set(m_pipeline.get(), "text-stream-combiner", textCombiner, nullptr);
 
     m_textSink = webkitTextSinkNew(makeWeakPtr(*this));

releases/WebKitGTK/webkit-2.34/Source/WebCore/platform/graphics/gstreamer/TextCombinerGStreamer.cpp

@@ -220 +220 @@
     // The combiner relies on webvttenc, fail early if it's not there.
     if (!isGStreamerPluginAvailable("subenc")) {
-        WTFLogAlways("WebKit wasn't able to find a WebVTT encoder. Not continuing without platform support for subtitles.");
+        WTFLogAlways("WebKit wasn't able to find a WebVTT encoder. Subtitles handling will be degraded unless gst-plugins-bad is installed.");
         return nullptr;
     }