Modified: trunk/ChangeLog (271397 => 271398)
--- trunk/ChangeLog 2021-01-12 11:33:22 UTC (rev 271397)
+++ trunk/ChangeLog 2021-01-12 12:10:08 UTC (rev 271398)
@@ -1,3 +1,14 @@
+2021-01-12 Xabier Rodriguez Calvar <[email protected]>
+
+ [GStreamer] Switch from ENABLE_ to USE_ in native audio/video and text sink options
+ https://bugs.webkit.org/show_bug.cgi?id=220515
+
+ Reviewed by Philippe Normand.
+
+ * Source/cmake/GStreamerDefinitions.cmake: Add USE_ definitions.
+ * Source/cmake/WebKitFeatures.cmake: Remove global ENABLE_
+ definitions.
+
2021-01-12 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.31.1 release
Modified: trunk/Source/WebCore/ChangeLog (271397 => 271398)
--- trunk/Source/WebCore/ChangeLog 2021-01-12 11:33:22 UTC (rev 271397)
+++ trunk/Source/WebCore/ChangeLog 2021-01-12 12:10:08 UTC (rev 271398)
@@ -1,3 +1,18 @@
+2021-01-12 Xabier Rodriguez Calvar <[email protected]>
+
+ [GStreamer] Switch from ENABLE_ to USE_ in native audio/video and text sink options
+ https://bugs.webkit.org/show_bug.cgi?id=220515
+
+ Reviewed by Philippe Normand.
+
+ ENABLE(TEXT_SINK), ENABLE(NATIVE_AUDIO) and ENABLE(NATIVE_VIDEO)
+ turned into USE(GSTREAMER_...).
+
+ This also disables soft-colorbalance when native video is active.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::setPlaybackFlags):
+
2021-01-12 Philippe Normand <[email protected]>
Unreviewed, GTK/WPE critical warning fix following-up r271396
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (271397 => 271398)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-01-12 11:33:22 UTC (rev 271397)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2021-01-12 12:10:08 UTC (rev 271398)
@@ -2704,6 +2704,7 @@
unsigned hasText = getGstPlayFlag("text");
unsigned hasNativeVideo = getGstPlayFlag("native-video");
unsigned hasNativeAudio = getGstPlayFlag("native-audio");
+ unsigned hasSoftwareColorBalance = getGstPlayFlag("soft-colorbalance");
unsigned flags = 0;
g_object_get(pipeline, "flags", &flags, nullptr);
@@ -2711,22 +2712,26 @@
flags = flags & ~hasText;
flags = flags & ~hasNativeAudio;
flags = flags & ~hasNativeVideo;
+ flags = flags & ~hasSoftwareColorBalance;
-#if !ENABLE(TEXT_SINK)
+#if !USE(GSTREAMER_TEXT_SINK)
hasText = 0x0;
#endif
-#if !ENABLE(NATIVE_VIDEO)
+#if USE(GSTREAMER_NATIVE_VIDEO)
+ hasSoftwareColorBalance = 0x0;
+#else
hasNativeVideo = 0x0;
#endif
-#if !ENABLE(NATIVE_AUDIO)
+#if !USE(GSTREAMER_NATIVE_AUDIO)
hasNativeAudio = 0x0;
#endif
- GST_INFO_OBJECT(pipeline, "text %s, audio %s (native %s), video %s (native %s)", boolForPrinting(hasText), boolForPrinting(hasAudio),
- boolForPrinting(hasNativeAudio), boolForPrinting(hasVideo), boolForPrinting(hasNativeVideo));
- flags |= hasText | hasAudio | hasVideo | hasNativeVideo | hasNativeAudio;
+ GST_INFO_OBJECT(pipeline, "text %s, audio %s (native %s), video %s (native %s, software color balance %s)", boolForPrinting(hasText),
+ boolForPrinting(hasAudio), boolForPrinting(hasNativeAudio), boolForPrinting(hasVideo), boolForPrinting(hasNativeVideo),
+ boolForPrinting(hasSoftwareColorBalance));
+ flags |= hasText | hasAudio | hasVideo | hasNativeVideo | hasNativeAudio | hasSoftwareColorBalance;
g_object_set(pipeline, "flags", flags, nullptr);
GST_DEBUG_OBJECT(pipeline, "current pipeline flags %x", flags);
}
Modified: trunk/Source/cmake/GStreamerDefinitions.cmake (271397 => 271398)
--- trunk/Source/cmake/GStreamerDefinitions.cmake 2021-01-12 11:33:22 UTC (rev 271397)
+++ trunk/Source/cmake/GStreamerDefinitions.cmake 2021-01-12 12:10:08 UTC (rev 271398)
@@ -1,6 +1,5 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TEXT_SINK PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PUBLIC ON)
@@ -8,3 +7,6 @@
WEBKIT_OPTION_DEFINE(USE_GSTREAMER_MPEGTS "Whether to enable support for MPEG-TS" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(USE_WPE_VIDEO_PLANE_DISPLAY_DMABUF "Whether to enable support for client-side video rendering" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(USE_GSTREAMER_FULL "Whether to enable support for static GStreamer builds" PRIVATE OFF)
+WEBKIT_OPTION_DEFINE(USE_GSTREAMER_NATIVE_VIDEO "Toggle native video support in GStreamer media player" PRIVATE OFF)
+WEBKIT_OPTION_DEFINE(USE_GSTREAMER_NATIVE_AUDIO "Toggle native audio support in GStreamer media player" PRIVATE OFF)
+WEBKIT_OPTION_DEFINE(USE_GSTREAMER_TEXT_SINK "Toggle text sink support in GStreamer media player" PRIVATE ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (271397 => 271398)
--- trunk/Source/cmake/WebKitFeatures.cmake 2021-01-12 11:33:22 UTC (rev 271397)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2021-01-12 12:10:08 UTC (rev 271398)
@@ -284,9 +284,6 @@
WEBKIT_OPTION_DEPEND(ENABLE_VIDEO_USES_ELEMENT_FULLSCREEN ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_TOUCH_SLIDER ENABLE_TOUCH_EVENTS)
WEBKIT_OPTION_DEPEND(ENABLE_WEBXR ENABLE_WEBGL)
- WEBKIT_OPTION_DEFINE(ENABLE_NATIVE_VIDEO "Toggle native video support in GStreamer media player" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_NATIVE_AUDIO "Toggle native audio support in GStreamer media player" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_TEXT_SINK "Toggle text sink support in GStreamer media player" PRIVATE OFF)
endmacro()
macro(_WEBKIT_OPTION_ENFORCE_DEPENDS _name)
