Changeset 271398 in webkit

Timestamp:

Jan 12, 2021, 4:10:08 AM (6 years ago)

Author:

calvaris@igalia.com

Message:

[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.

Source/WebCore:

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):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (2 diffs)
• Source/cmake/GStreamerDefinitions.cmake (modified) (2 diffs)
• Source/cmake/WebKitFeatures.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2021-01-12  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [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  <cgarcia@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-12  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        [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  <pnormand@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -2705 +2705 @@
     unsigned hasNativeVideo = getGstPlayFlag("native-video");
     unsigned hasNativeAudio = getGstPlayFlag("native-audio");
+    unsigned hasSoftwareColorBalance = getGstPlayFlag("soft-colorbalance");
 
     unsigned flags = 0;
@@ -2712 +2713 @@
     flags = flags & ~hasNativeAudio;
     flags = flags & ~hasNativeVideo;
-
-#if !ENABLE(TEXT_SINK)
+    flags = flags & ~hasSoftwareColorBalance;
+
+#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);

trunk/Source/cmake/GStreamerDefinitions.cmake

@@ -1 +1 @@
 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)
@@ -9 +8 @@
 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)

trunk/Source/cmake/WebKitFeatures.cmake

@@ -285 +285 @@
     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()