Changeset 267138 in webkit

Timestamp:

Sep 16, 2020 12:08:03 AM (4 years ago)

Author:

Philippe Normand

Message:

[GStreamer][1.18] Regressions
​https://bugs.webkit.org/show_bug.cgi?id=216558

Reviewed by Xabier Rodriguez-Calvar.

The most significant change here is the added support for video rendering stats caching.
This was caught by
imported/w3c/web-platform-tests/media-source/mediasource-getvideoplaybackquality.html

• platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:

(webKitGLVideoSinkGetProperty): Fix 1.18 version runtime check. 1.17 was the development version of 1.18.

• platform/graphics/gstreamer/GStreamerRegistryScanner.cpp:

(WebCore::GStreamerRegistryScanner::isAVC1CodecSupported const): Ditto.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::createVideoSink): Ditto.
(WebCore::MediaPlayerPrivateGStreamer::videoPlaybackQualityMetrics): Cache or reuse cached
statistics. Caching is required so that metrics queries performed after EOS still return
valid values.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-16  Philippe Normand  <pnormand@igalia.com>
+
+        [GStreamer][1.18] Regressions
+        https://bugs.webkit.org/show_bug.cgi?id=216558
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        The most significant change here is the added support for video rendering stats caching.
+        This was caught by
+        imported/w3c/web-platform-tests/media-source/mediasource-getvideoplaybackquality.html
+
+        * platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:
+        (webKitGLVideoSinkGetProperty): Fix 1.18 version runtime check. 1.17 was the development version of 1.18.
+        * platform/graphics/gstreamer/GStreamerRegistryScanner.cpp:
+        (WebCore::GStreamerRegistryScanner::isAVC1CodecSupported const): Ditto.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::createVideoSink): Ditto.
+        (WebCore::MediaPlayerPrivateGStreamer::videoPlaybackQualityMetrics): Cache or reuse cached
+        statistics. Caching is required so that metrics queries performed after EOS still return
+        valid values.
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
 2020-09-15  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

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

@@ -188 +188 @@
     switch (propertyId) {
     case PROP_STATS:
-        if (webkitGstCheckVersion(1, 17, 0)) {
+        if (webkitGstCheckVersion(1, 18, 0)) {
             GUniqueOutPtr<GstStructure> stats;
             g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);

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

@@ -422 +422 @@
     }
 
-    if (webkitGstCheckVersion(1, 17, 0)) {
+    if (webkitGstCheckVersion(1, 18, 0)) {
         GST_DEBUG("Checking video decoders for constrained caps");
         return checkH264Caps(makeString("video/x-h264, level=(string)", level, ", profile=(string)", profile).utf8().data());

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

@@ -3389 +3389 @@
 
     GstElement* videoSink = nullptr;
-    if (!webkitGstCheckVersion(1, 17, 0)) {
+    if (!webkitGstCheckVersion(1, 18, 0)) {
         m_fpsSink = gst_element_factory_make("fpsdisplaysink", "sink");
         if (m_fpsSink) {
@@ -3435 +3435 @@
 Optional<VideoPlaybackQualityMetrics> MediaPlayerPrivateGStreamer::videoPlaybackQualityMetrics()
 {
-    if (!webkitGstCheckVersion(1, 17, 0) && !m_fpsSink)
+    if (!webkitGstCheckVersion(1, 18, 0) && !m_fpsSink)
         return WTF::nullopt;
 
     uint64_t totalVideoFrames = 0;
     uint64_t droppedVideoFrames = 0;
-    if (webkitGstCheckVersion(1, 17, 0)) {
+    if (webkitGstCheckVersion(1, 18, 0)) {
         GUniqueOutPtr<GstStructure> stats;
         g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
@@ -3455 +3455 @@
         droppedVideoFrames = droppedFrames;
     }
+
+    // Cache or reuse cached statistics. Caching is required so that metrics queries performed
+    // after EOS still return valid values.
+    if (totalVideoFrames)
+        m_totalVideoFrames = totalVideoFrames;
+    else if (m_totalVideoFrames)
+        totalVideoFrames = m_totalVideoFrames;
+    if (droppedVideoFrames)
+        m_droppedVideoFrames = droppedVideoFrames;
+    else if (m_droppedVideoFrames)
+        droppedVideoFrames = m_droppedVideoFrames;
 
     uint32_t corruptedVideoFrames = 0;

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

@@ -534 +534 @@
 
     GRefPtr<GstElement> m_fpsSink { nullptr };
+    uint64_t m_totalVideoFrames { 0 };
+    uint64_t m_droppedVideoFrames { 0 };
 
 private: