Attachment 347259 Details for Bug 188648 – Patch

[patch] Patch

bug-188648-20180816153303.patch (text/plain), 2.48 KB, created by Philippe Normand on 2018-08-16 06:33:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2018-08-16 06:33:04 PDT

Size: 2.48 KB

patch

obsolete

>Subversion Revision: 234920
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index bed7d527e4e8841320390c0691d6a0422030411f..4090097b26a10c066ef1fcaf72ec15f4cb662d8d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-16  Philippe Normand  <philn@igalia.com>
>+
>+        [GStreamer] Enable fpsdisplaysink only when MEDIA_STATISTICS is enabled
>+        https://bugs.webkit.org/show_bug.cgi?id=188648
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The fpsdisplaysink is useful only when MEDIA_STATISTICS is turned on.
>+        The text overlay is now enabled when GST_DEBUG tracing is enabled for the player.
>+        
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamerBase::createVideoSink):
>+
> 2018-08-16  Antti Koivisto  <antti@apple.com>
> 
>         Use OptionSet for ActivityState::Flags
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index 49ccf86445f49f585122a1acd7a31a4cf2d3ce37..db6088e8b4e3c2001aa0fc50d9b5e1b0d3e448af 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>@@ -1175,17 +1175,14 @@ GstElement* MediaPlayerPrivateGStreamerBase::createVideoSink()
>     }
> 
>     GstElement* videoSink = nullptr;
>+#if ENABLE(MEDIA_STATISTICS)
>     m_fpsSink = gst_element_factory_make("fpsdisplaysink", "sink");
>     if (m_fpsSink) {
>         g_object_set(m_fpsSink.get(), "silent", TRUE , nullptr);
> 
>-        // Turn off text overlay unless logging is enabled.
>-#if LOG_DISABLED
>-        g_object_set(m_fpsSink.get(), "text-overlay", FALSE , nullptr);
>-#else
>-        if (!isLogChannelEnabled("Media"))
>+        // Turn off text overlay unless tracing is enabled.
>+        if (gst_debug_category_get_threshold(webkit_media_player_debug) < GST_LEVEL_TRACE)
>             g_object_set(m_fpsSink.get(), "text-overlay", FALSE , nullptr);
>-#endif // LOG_DISABLED
> 
>         if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_fpsSink.get()), "video-sink")) {
>             g_object_set(m_fpsSink.get(), "video-sink", m_videoSink.get(), nullptr);
>@@ -1193,6 +1190,7 @@ GstElement* MediaPlayerPrivateGStreamerBase::createVideoSink()
>         } else
>             m_fpsSink = nullptr;
>     }
>+#endif
> 
>     if (!m_fpsSink)
>         videoSink = m_videoSink.get();

Flags:

calvaris: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188648: 347259