Changeset 83561 in webkit

Timestamp:

Apr 12, 2011 12:52:58 AM (13 years ago)

Author:

Philippe Normand

Message:

2011-04-07 Philippe Normand <​pnormand@igalia.com>

Reviewed by Martin Robinson.

[GStreamer] report playback statistics
​https://bugs.webkit.org/show_bug.cgi?id=58033

Provide media playback statistics using fpsdisplaysink and
position queries.

• manual-tests/video-statistics.html: Added.
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivateGStreamer::decodedFrameCount): (WebCore::MediaPlayerPrivateGStreamer::droppedFrameCount): (WebCore::MediaPlayerPrivateGStreamer::audioDecodedByteCount): (WebCore::MediaPlayerPrivateGStreamer::videoDecodedByteCount): (WebCore::MediaPlayerPrivateGStreamer::updateAudioSink): (WebCore::MediaPlayerPrivateGStreamer::updateStates): (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/video-statistics.html (added)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (4 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-07  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GStreamer] report playback statistics
+        https://bugs.webkit.org/show_bug.cgi?id=58033
+
+        Provide media playback statistics using fpsdisplaysink and
+        position queries.
+
+        * manual-tests/video-statistics.html: Added.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::decodedFrameCount):
+        (WebCore::MediaPlayerPrivateGStreamer::droppedFrameCount):
+        (WebCore::MediaPlayerPrivateGStreamer::audioDecodedByteCount):
+        (WebCore::MediaPlayerPrivateGStreamer::videoDecodedByteCount):
+        (WebCore::MediaPlayerPrivateGStreamer::updateAudioSink):
+        (WebCore::MediaPlayerPrivateGStreamer::updateStates):
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
 2011-04-11  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -350 +350 @@
     , m_audioTagsTimerHandler(0)
     , m_videoTagsTimerHandler(0)
+    , m_webkitAudioSink(0)
 {
     if (doGstInit())
@@ -959 +960 @@
 }
 
+unsigned MediaPlayerPrivateGStreamer::decodedFrameCount() const
+{
+    guint64 decodedFrames = 0;
+    if (m_fpsSink)
+        g_object_get(m_fpsSink, "frames-rendered", &decodedFrames, NULL);
+    return static_cast<unsigned>(decodedFrames);
+}
+
+unsigned MediaPlayerPrivateGStreamer::droppedFrameCount() const
+{
+    guint64 framesDropped = 0;
+    if (m_fpsSink)
+        g_object_get(m_fpsSink, "frames-dropped", &framesDropped, NULL);
+    return static_cast<unsigned>(framesDropped);
+}
+
+unsigned MediaPlayerPrivateGStreamer::audioDecodedByteCount() const
+{
+    GstQuery* query = gst_query_new_position(GST_FORMAT_BYTES);
+    gint64 position = 0;
+
+    if (m_webkitAudioSink && gst_element_query(m_webkitAudioSink, query))
+        gst_query_parse_position(query, 0, &position);
+
+    gst_query_unref(query);
+    return static_cast<unsigned>(position);
+}
+
+unsigned MediaPlayerPrivateGStreamer::videoDecodedByteCount() const
+{
+    GstQuery* query = gst_query_new_position(GST_FORMAT_BYTES);
+    gint64 position = 0;
+
+    if (gst_element_query(m_webkitVideoSink, query))
+        gst_query_parse_position(query, 0, &position);
+
+    gst_query_unref(query);
+    return static_cast<unsigned>(position);
+}
+
+void MediaPlayerPrivateGStreamer::updateAudioSink()
+{
+    if (!m_playBin)
+        return;
+
+    GOwnPtr<GstElement> element;
+
+    g_object_get(m_playBin, "audio-sink", &element.outPtr(), NULL);
+    gst_object_replace(reinterpret_cast<GstObject**>(&m_webkitAudioSink),
+                       reinterpret_cast<GstObject*>(element.get()));
+}
+
 void MediaPlayerPrivateGStreamer::cancelLoad()
 {
@@ -1018 +1071 @@
         // needed.
         if (state == GST_STATE_PAUSED) {
+            if (!m_webkitAudioSink)
+                updateAudioSink();
             if (m_buffering && m_bufferingPercentage == 100) {
                 m_buffering = false;
@@ -1620 +1675 @@
     gst_object_unref(GST_OBJECT(sinkPad));
 
-    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(m_fpsSink, "video-sink", m_webkitVideoSink, NULL);
-            gst_bin_add(GST_BIN(m_videoSinkBin), m_fpsSink);
+    m_fpsSink = gst_element_factory_make("fpsdisplaysink", "sink");
+
+    if (m_fpsSink) {
+        // The verbose property has been added in -bad 0.10.22. Making
+        // this whole code depend on it because we don't want
+        // fpsdiplaysink to spit data on stdout.
+        GstElementFactory* factory = GST_ELEMENT_FACTORY(GST_ELEMENT_GET_CLASS(m_fpsSink)->elementfactory);
+        if (gst_plugin_feature_check_version(GST_PLUGIN_FEATURE(factory), 0, 10, 22)) {
+            g_object_set(m_fpsSink, "silent", TRUE , NULL);
+
+            // Turn off text overlay unless logging is enabled.
+            WTFLogChannel* channel = getChannelFromName("Media");
+            if (channel->state != WTFLogChannelOn)
+                g_object_set(m_fpsSink, "text-overlay", FALSE , NULL);
+
+            if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_fpsSink), "video-sink")) {
+                g_object_set(m_fpsSink, "video-sink", m_webkitVideoSink, NULL);
+                gst_bin_add(GST_BIN(m_videoSinkBin), m_fpsSink);
 #if GST_CHECK_VERSION(0, 10, 30)
-            // Faster elements linking, if possible.
-            gst_element_link_pads_full(queue, "src", m_fpsSink, "sink", GST_PAD_LINK_CHECK_NOTHING);
+                // Faster elements linking, if possible.
+                gst_element_link_pads_full(queue, "src", m_fpsSink, "sink", GST_PAD_LINK_CHECK_NOTHING);
 #else
-            gst_element_link(queue, m_fpsSink);
+                gst_element_link(queue, m_fpsSink);
 #endif
-        } else {
+            } else
+                m_fpsSink = 0;
+        } else
             m_fpsSink = 0;
-            gst_bin_add(GST_BIN(m_videoSinkBin), m_webkitVideoSink);
-#if GST_CHECK_VERSION(0, 10, 30)
-            // Faster elements linking, if possible.
-            gst_element_link_pads_full(queue, "src", m_webkitVideoSink, "sink", GST_PAD_LINK_CHECK_NOTHING);
-#else
-            gst_element_link(queue, m_webkitVideoSink);
-#endif
-            LOG_VERBOSE(Media, "Can't display FPS statistics, you need gst-plugins-bad >= 0.10.18");
-        }
-    } else {
+    }
+
+    if (!m_fpsSink) {
         gst_bin_add(GST_BIN(m_videoSinkBin), m_webkitVideoSink);
 #if GST_CHECK_VERSION(0, 10, 30)

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

@@ -136 +136 @@
             void notifyPlayerOfAudioTags();
 
+            unsigned decodedFrameCount() const;
+            unsigned droppedFrameCount() const;
+            unsigned audioDecodedByteCount() const;
+            unsigned videoDecodedByteCount() const;
+
         private:
             MediaPlayerPrivateGStreamer(MediaPlayer*);
@@ -145 +150 @@
             static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
             static bool isAvailable();
+
+            void updateAudioSink();
 
             void cacheDuration();
@@ -194 +201 @@
             guint m_audioTagsTimerHandler;
             guint m_videoTagsTimerHandler;
+            GstElement* m_webkitAudioSink;
     };
 }