Changeset 278406 in webkit

Timestamp:

Jun 3, 2021, 7:27:11 AM (5 years ago)

Author:

magomez@igalia.com

Message:

[GStreamer] Remove dependency on glvideoflip and videoflip
​https://bugs.webkit.org/show_bug.cgi?id=225456

Reviewed by Philippe Normand.

Stop using videoflip and glvideoflip to rotate the video frames inside GStreamer. These perform a copy
of the frame to perform the rotation that we can avoid if we rotate the frames ourselves when painting them.

Covered by existent tests.

• platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:

(webKitGLVideoSinkConstructed):
(webKitGLVideoSinkGetProperty):
(webkit_gl_video_sink_class_init):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
(WebCore::MediaPlayerPrivateGStreamer::updateVideoSizeAndOrientationFromCaps):
(WebCore::MediaPlayerPrivateGStreamer::paint):
(WebCore::MediaPlayerPrivateGStreamer::createVideoSinkGL):

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-03  Miguel Gomez  <magomez@igalia.com>
+
+        [GStreamer] Remove dependency on glvideoflip and videoflip
+        https://bugs.webkit.org/show_bug.cgi?id=225456
+
+        Reviewed by Philippe Normand.
+
+        Stop using videoflip and glvideoflip to rotate the video frames inside GStreamer. These perform a copy
+        of the frame to perform the rotation that we can avoid if we rotate the frames ourselves when painting them.
+
+        Covered by existent tests.
+
+        * platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp:
+        (webKitGLVideoSinkConstructed):
+        (webKitGLVideoSinkGetProperty):
+        (webkit_gl_video_sink_class_init):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin):
+        (WebCore::MediaPlayerPrivateGStreamer::updateVideoSizeAndOrientationFromCaps):
+        (WebCore::MediaPlayerPrivateGStreamer::paint):
+        (WebCore::MediaPlayerPrivateGStreamer::createVideoSinkGL):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
 2021-06-03  Antti Koivisto  <antti@apple.com>
 

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

@@ -41 +41 @@
     PROP_0,
     PROP_STATS,
-    PROP_HANDLES_ROTATION_TAGS,
     PROP_LAST
 };
@@ -48 +47 @@
     GRefPtr<GstElement> appSink;
     MediaPlayerPrivateGStreamer* mediaPlayerPrivate;
-    bool handlesRotationTags;
 };
 
@@ -84 +82 @@
     GstElement* upload = makeGStreamerElement("glupload", nullptr);
     GstElement* colorconvert = makeGStreamerElement("glcolorconvert", nullptr);
-
-    GstElement* videoFlip = makeGStreamerElement("glvideoflip", nullptr);
-    sink->priv->handlesRotationTags = videoFlip;
-
-    if (videoFlip) {
-        gst_util_set_object_arg(G_OBJECT(videoFlip), "method", "automatic");
-        gst_bin_add(GST_BIN_CAST(sink), videoFlip);
-    }
 
     ASSERT(upload);
@@ -123 +113 @@
     gst_element_link(upload, colorconvert);
 
-    if (videoFlip)
-        gst_element_link_many(colorconvert, videoFlip, sink->priv->appSink.get(), nullptr);
-    else
-        gst_element_link(colorconvert, sink->priv->appSink.get());
+    gst_element_link(colorconvert, sink->priv->appSink.get());
 
     GstElement* sinkElement =
@@ -223 +210 @@
         }
         break;
-    case PROP_HANDLES_ROTATION_TAGS:
-        g_value_set_boolean(value, sink->priv->handlesRotationTags);
-        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, paramSpec);
@@ -247 +231 @@
     g_object_class_install_property(objectClass, PROP_STATS, g_param_spec_boxed("stats", "Statistics",
         "Sink Statistics", GST_TYPE_STRUCTURE, static_cast<GParamFlags>(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
-
-    g_object_class_install_property(objectClass, PROP_HANDLES_ROTATION_TAGS, g_param_spec_boolean("handles-rotation-tags", "Handles Rotation Tags",
-        "True if the sink is relying on glvideoflip to handle frame rotation", FALSE, static_cast<GParamFlags>(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)));
 
     elementClass->change_state = GST_DEBUG_FUNCPTR(webKitGLVideoSinkChangeState);

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

@@ -2803 +2803 @@
         return;
 
-    if (!m_canRenderingBeAccelerated) {
-        // If not using accelerated compositing, let GStreamer handle
-        // the image-orientation tag.
-        GstElement* videoFlip = makeGStreamerElement("videoflip", nullptr);
-        if (videoFlip) {
-            gst_util_set_object_arg(G_OBJECT(videoFlip), "method", "automatic");
-            g_object_set(m_pipeline.get(), "video-filter", videoFlip, nullptr);
-        } else
-            m_shouldHandleOrientationTags = true;
-    }
-
     GRefPtr<GstPad> videoSinkPad = adoptGRef(gst_element_get_static_pad(m_videoSink.get(), "sink"));
     if (videoSinkPad)
@@ -3059 +3048 @@
     }
 
-    if (m_shouldHandleOrientationTags)
-        setVideoSourceOrientation(getVideoOrientation(m_videoSink.get()));
-
-#if USE(TEXTURE_MAPPER_GL)
-    // When using accelerated compositing, if the video is tagged as rotated 90 or 270 degrees, swap width and height.
-    if (m_canRenderingBeAccelerated) {
-        if (m_videoSourceOrientation.usesWidthAsHeight())
-            originalSize = originalSize.transposedSize();
-    }
-#endif
+    setVideoSourceOrientation(getVideoOrientation(m_videoSink.get()));
+    // If the video is tagged as rotated 90 or 270 degrees, swap width and height.
+    if (m_videoSourceOrientation.usesWidthAsHeight())
+        originalSize = originalSize.transposedSize();
 
     GST_DEBUG_OBJECT(pipeline(), "Original video size: %dx%d", originalSize.width(), originalSize.height());
@@ -3327 +3310 @@
         return;
 
-    context.drawImage(gstImage->image(), rect, gstImage->rect(), { gstImage->hasAlpha() ? CompositeOperator::SourceOver : CompositeOperator::Copy, m_shouldHandleOrientationTags ? m_videoSourceOrientation : ImageOrientation() });
+    FloatRect imageRect = m_videoSourceOrientation.usesWidthAsHeight() ? FloatRect(gstImage->rect().location(), gstImage->rect().size().transposedSize()) : gstImage->rect();
+
+    context.drawImage(gstImage->image(), rect, imageRect, { gstImage->hasAlpha() ? CompositeOperator::SourceOver : CompositeOperator::Copy, m_videoSourceOrientation });
 }
 
@@ -3430 +3415 @@
     webKitGLVideoSinkSetMediaPlayerPrivate(WEBKIT_GL_VIDEO_SINK(sink), this);
 
-    gboolean handlesRotationTags;
-    g_object_get(sink, "handles-rotation-tags", &handlesRotationTags, nullptr);
-    m_shouldHandleOrientationTags = !handlesRotationTags;
-
     return sink;
 }

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

@@ -563 +563 @@
     uint64_t m_droppedVideoFrames { 0 };
 
-    // This is set to true if no videoflip element has been added to the pipeline.
-    bool m_shouldHandleOrientationTags { false };
-
     DataMutex<TaskAtMediaTimeScheduler> m_TaskAtMediaTimeSchedulerDataMutex;