Diff
Modified: trunk/Source/WebCore/ChangeLog (290649 => 290650)
--- trunk/Source/WebCore/ChangeLog 2022-03-01 16:19:30 UTC (rev 290649)
+++ trunk/Source/WebCore/ChangeLog 2022-03-01 17:08:29 UTC (rev 290650)
@@ -1,3 +1,16 @@
+2022-03-01 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r290325.
+ https://bugs.webkit.org/show_bug.cgi?id=237326
+
+ Broken patch
+
+ Reverted changeset:
+
+ "[GStreamer] Switch media player to playbin3"
+ https://bugs.webkit.org/show_bug.cgi?id=236884
+ https://commits.webkit.org/r290325
+
2022-03-01 Alan Bujtas <[email protected]>
[IFC][Integration] InlineIterator::Box::rect() returns the unflipped visual rect
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (290649 => 290650)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2022-03-01 16:19:30 UTC (rev 290649)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2022-03-01 17:08:29 UTC (rev 290650)
@@ -94,7 +94,6 @@
#include <wtf/text/StringConcatenateNumbers.h>
#include <wtf/URL.h>
#include <wtf/WallTime.h>
-#include <wtf/text/StringToIntegerConversion.h>
#if USE(GSTREAMER_MPEGTS)
#define GST_USE_UNSTABLE_API
@@ -2663,14 +2662,13 @@
void MediaPlayerPrivateGStreamer::createGSTPlayBin(const URL& url)
{
GST_INFO("Creating pipeline for %s player", m_player->isVideoPlayer() ? "video" : "audio");
+ const char* playbinName = "playbin";
- // MSE and Mediastream require playbin3. Regular playback uses playbin3 if GStreamer >= 1.20 is
- // detected, unless the WEBKIT_GST_USE_PLAYBIN2 environment variable is set to 1.
- const char* playbinName = "playbin3";
- const char* usePlaybin2Override = g_getenv("WEBKIT_GST_USE_PLAYBIN2");
- auto usePlaybin2 = usePlaybin2Override ? parseInteger<unsigned>(usePlaybin2Override) : 0;
- if ((usePlaybin2 || !webkitGstCheckVersion(1, 20, 0)) && !isMediaSource() && !url.protocolIs("mediastream"))
- playbinName = "playbin";
+ // MSE and Mediastream require playbin3. Regular playback can use playbin3 on-demand with the
+ // WEBKIT_GST_USE_PLAYBIN3 environment variable.
+ const char* usePlaybin3 = g_getenv("WEBKIT_GST_USE_PLAYBIN3");
+ if ((isMediaSource() || url.protocolIs("mediastream") || (usePlaybin3 && equal(usePlaybin3, "1"))))
+ playbinName = "playbin3";
ASSERT(!m_pipeline);
Modified: trunk/Tools/ChangeLog (290649 => 290650)
--- trunk/Tools/ChangeLog 2022-03-01 16:19:30 UTC (rev 290649)
+++ trunk/Tools/ChangeLog 2022-03-01 17:08:29 UTC (rev 290650)
@@ -1,3 +1,16 @@
+2022-03-01 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r290325.
+ https://bugs.webkit.org/show_bug.cgi?id=237326
+
+ Broken patch
+
+ Reverted changeset:
+
+ "[GStreamer] Switch media player to playbin3"
+ https://bugs.webkit.org/show_bug.cgi?id=236884
+ https://commits.webkit.org/r290325
+
2022-03-01 Angelos Oikonomopoulos <[email protected]>
[JSC] Implement chunking for the GNU parallel runner
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (290649 => 290650)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2022-03-01 16:19:30 UTC (rev 290649)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2022-03-01 17:08:29 UTC (rev 290650)
@@ -121,7 +121,7 @@
self._copy_value_from_environ_if_set(environment, 'WEBKIT_JHBUILD')
self._copy_value_from_environ_if_set(environment, 'WEBKIT_TOP_LEVEL')
self._copy_value_from_environ_if_set(environment, 'WEBKIT_DEBUG')
- self._copy_value_from_environ_if_set(environment, 'WEBKIT_GST_USE_PLAYBIN2')
+ self._copy_value_from_environ_if_set(environment, 'WEBKIT_GST_USE_PLAYBIN3')
for gst_variable in ('DEBUG', 'DEBUG_DUMP_DOT_DIR', 'DEBUG_FILE', 'DEBUG_NO_COLOR',
'PLUGIN_SCANNER', 'PLUGIN_PATH', 'PLUGIN_SYSTEM_PATH', 'REGISTRY',
'PLUGIN_PATH_1_0'):
Modified: trunk/Tools/Scripts/webkitpy/port/wpe.py (290649 => 290650)
--- trunk/Tools/Scripts/webkitpy/port/wpe.py 2022-03-01 16:19:30 UTC (rev 290649)
+++ trunk/Tools/Scripts/webkitpy/port/wpe.py 2022-03-01 17:08:29 UTC (rev 290650)
@@ -92,7 +92,7 @@
self._copy_value_from_environ_if_set(environment, 'PULSE_SERVER')
self._copy_value_from_environ_if_set(environment, 'PULSE_CLIENTCONFIG')
self._copy_value_from_environ_if_set(environment, 'XR_RUNTIME_JSON')
- self._copy_value_from_environ_if_set(environment, 'WEBKIT_GST_USE_PLAYBIN2')
+ self._copy_value_from_environ_if_set(environment, 'WEBKIT_GST_USE_PLAYBIN3')
for gst_variable in ('DEBUG', 'DEBUG_DUMP_DOT_DIR', 'DEBUG_FILE', 'DEBUG_NO_COLOR',
'PLUGIN_SCANNER', 'PLUGIN_PATH', 'PLUGIN_SYSTEM_PATH', 'REGISTRY',
'PLUGIN_PATH_1_0'):
