Changeset 52251 in webkit

Timestamp:

Dec 17, 2009 6:27:00 AM (14 years ago)

Author:

Philippe Normand

Message:

Reviewed by Xan Lopez.

[GTK] display FPS stats for video element
​https://bugs.webkit.org/show_bug.cgi?id=32560

Display FPS statistics if WEBKIT_DEBUG environment variable
contains the Media log category. This feature requires a very
recent (>= 0.10.18) version of gst-plugins-bad.

• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivate::MediaPlayerPrivate): (WebCore::MediaPlayerPrivate::~MediaPlayerPrivate): (WebCore::MediaPlayerPrivate::createGSTPlayBin):
• platform/graphics/gtk/MediaPlayerPrivateGStreamer.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp (modified) (3 diffs)
• platform/graphics/gtk/MediaPlayerPrivateGStreamer.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-15  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] display FPS stats for video element
+        https://bugs.webkit.org/show_bug.cgi?id=32560
+
+        Display FPS statistics if WEBKIT_DEBUG environment variable
+        contains the Media log category. This feature requires a very
+        recent (>= 0.10.18) version of gst-plugins-bad.
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+        (WebCore::MediaPlayerPrivate::~MediaPlayerPrivate):
+        (WebCore::MediaPlayerPrivate::createGSTPlayBin):
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.h:
+
 2009-11-11  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp

@@ -197 +197 @@
     , m_playBin(0)
     , m_videoSink(0)
+    , m_fpsSink(0)
     , m_source(0)
     , m_seekTime(0)
@@ -234 +235 @@
         g_object_unref(m_videoSink);
         m_videoSink = 0;
+    }
+
+    if (m_fpsSink) {
+        g_object_unref(m_fpsSink);
+        m_fpsSink = 0;
     }
 }
@@ -928 +934 @@
 
     g_object_ref_sink(m_videoSink);
-    g_object_set(m_playBin, "video-sink", m_videoSink, NULL);
+
+    WTFLogChannel* channel = getChannelFromName("Media");
+    if (channel->state == WTFLogChannelOn) {
+        m_fpsSink = gst_element_factory_make("fpsdisplaysink", "sink");
+        if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_fpsSink), "video-sink")) {
+            g_object_set(G_OBJECT(m_fpsSink), "video-sink", m_videoSink, NULL);
+            g_object_ref_sink(m_fpsSink);
+            g_object_set(m_playBin, "video-sink", m_fpsSink, NULL);
+        } else {
+            m_fpsSink = 0;
+            g_object_set(m_playBin, "video-sink", m_videoSink, NULL);
+            LOG(Media, "Can't display FPS statistics, you need gst-plugins-bad >= 0.10.18");
+        }
+    } else
+        g_object_set(m_playBin, "video-sink", m_videoSink, NULL);
 
     g_signal_connect(m_videoSink, "repaint-requested", G_CALLBACK(mediaPlayerPrivateRepaintCallback), this);

trunk/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.h

@@ -126 +126 @@
             GstElement* m_playBin;
             GstElement* m_videoSink;
+            GstElement* m_fpsSink;
             GstElement* m_source;
             GstClockTime m_seekTime;