Attachment 373228 Details for Bug 196966 – Patch

[patch] Patch

bug-196966-20190701152606.patch (text/plain), 10.89 KB, created by Víctor M. Jáquez L. on 2019-07-01 06:25:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Víctor M. Jáquez L.

Created: 2019-07-01 06:25:35 PDT

Size: 10.89 KB

patch

obsolete

>Subversion Revision: 246965
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 157cee590b84dd72be80ba82cdab254915dcd22a..8e77e778db3932143b14b7bed6468dcffa1d710c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,48 @@
>+2019-07-01  VÃctor Manuel JÃ¡quez Leal  <vjaquez@igalia.com>
>+
>+        [GL][GStreamer] activate wrapped shared context
>+        https://bugs.webkit.org/show_bug.cgi?id=196966
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch consists in two parts:
>+
>+        1\ When the media player is instantiated, and it is intended to
>+        render textures, it will use a wrapped object of the application's
>+        GL context, and in order to populate the wrapped object with the
>+        GL vtable, the context has to be current. Thus, this patch makes
>+        current the shared WebKit application context, and populate the
>+        wrapped GstGLContext by activating it and filling in it.
>+
>+        2\ Also this patch makes GL texture use the RGBA color space, thus
>+        the color transformation is done in GStreamer, and no further color
>+        transformation is required in WebKit.
>+
>+        3\ Since it is not necessary to modify behavior if the decoder is
>+        imxvpudecoder, its identification and label were removed.
>+
>+        No new tests because there is no behavior change.
>+
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamer::createGSTPlayBin): Removes
>+        the IMX VPU identification.
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamerBase::ensureGstGLContext):
>+        Intializes the wrapped GL Context.
>+        (WebCore::MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags):
>+        Removes frame's color conversion.
>+        (WebCore::MediaPlayerPrivateGStreamerBase::createVideoSinkGL):
>+        Instead of parsing a string, the GstCaps are created manually, and
>+        it is set to appsink, rather than a filtered linking.
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
>+        Removes ImxVPU enumeration value.
>+        * platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp:
>+        (WebCore::VideoTextureCopierGStreamer::updateColorConversionMatrix):
>+        Adds NoConvert option to texture copier.
>+        * platform/graphics/gstreamer/VideoTextureCopierGStreamer.h: Adds
>+        NoConvert enumeration value and adds a variable expressing if
>+        color conversion has to be done.
>+
> 2019-07-01  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         WebSockets: add support for sending blob messages when using web sockets platform APIs
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>index 709a1b628466a12541bca8a142e96613f87adcde..8fc211168efc6d4d6a913769e8ffa8137f069db4 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
>@@ -2389,8 +2389,6 @@ void MediaPlayerPrivateGStreamer::createGSTPlayBin(const URL& url, const String&
>         GUniquePtr<char> elementName(gst_element_get_name(element));
>         if (g_str_has_prefix(elementName.get(), "v4l2"))
>             player->m_videoDecoderPlatform = WebKitGstVideoDecoderPlatform::Video4Linux;
>-        else if (g_str_has_prefix(elementName.get(), "imxvpudecoder"))
>-            player->m_videoDecoderPlatform = WebKitGstVideoDecoderPlatform::ImxVPU;
> 
>         player->updateTextureMapperFlags();
>     }), this);
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index d03d4b58a9abcd47ec1da5978c2db04f286361ed..12cc0970724dfcf8480b704954f4b518fd7d5b60 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>@@ -54,19 +54,10 @@
> #endif
> 
> #if USE(GSTREAMER_GL)
>-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
>-#define GST_GL_CAPS_FORMAT "{ BGRx, BGRA }"
>-#define TEXTURE_MAPPER_COLOR_CONVERT_FLAG TextureMapperGL::ShouldConvertTextureBGRAToRGBA
>-#define TEXTURE_COPIER_COLOR_CONVERT_FLAG VideoTextureCopierGStreamer::ColorConversion::ConvertBGRAToRGBA
>-#else
>-#define GST_GL_CAPS_FORMAT "{ xRGB, ARGB }"
>-#define TEXTURE_MAPPER_COLOR_CONVERT_FLAG TextureMapperGL::ShouldConvertTextureARGBToRGBA
>-#define TEXTURE_COPIER_COLOR_CONVERT_FLAG VideoTextureCopierGStreamer::ColorConversion::ConvertARGBToRGBA
>-#endif
>+#define TEXTURE_COPIER_COLOR_CONVERT_FLAG VideoTextureCopierGStreamer::ColorConversion::NoConvert
> 
> #include <gst/app/gstappsink.h>
> 
>-
> #include "GLContext.h"
> #if USE(GLX)
> #include "GLContextGLX.h"
>@@ -466,6 +457,18 @@ bool MediaPlayerPrivateGStreamerBase::ensureGstGLContext()
>     else
>         m_glContext = gst_gl_context_new_wrapped(m_glDisplay.get(), reinterpret_cast<guintptr>(contextHandle), glPlatform, glAPI);
> 
>+    // Activate and fill the GStreamer wrapped context with the Webkit's shared one.
>+    auto previousActiveContext = GLContext::current();
>+    webkitContext->makeContextCurrent();
>+    if (gst_gl_context_activate(m_glContext.get(), TRUE)) {
>+        GUniqueOutPtr<GError> error;
>+        if (!gst_gl_context_fill_info(m_glContext.get(), &error.outPtr()))
>+            GST_WARNING("Failed to fill in GStreamer context: %s", error->message);
>+    } else
>+        GST_WARNING("Failed to activate GStreamer context %" GST_PTR_FORMAT, m_glContext.get());
>+    if (previousActiveContext)
>+        previousActiveContext->makeContextCurrent();
>+
>     return true;
> }
> #endif // USE(GSTREAMER_GL)
>@@ -984,14 +987,6 @@ void MediaPlayerPrivateGStreamerBase::updateTextureMapperFlags()
>         m_textureMapperFlags = 0;
>         break;
>     }
>-
>-#if USE(GSTREAMER_GL)
>-    // When the imxvpudecoder is used, the texture sampling of the
>-    // directviv-uploaded texture returns an RGB value, so there's no need to
>-    // convert it.
>-    if (m_videoDecoderPlatform != WebKitGstVideoDecoderPlatform::ImxVPU)
>-        m_textureMapperFlags |= TEXTURE_MAPPER_COLOR_CONVERT_FLAG;
>-#endif
> }
> #endif
> 
>@@ -1056,6 +1051,10 @@ GstElement* MediaPlayerPrivateGStreamerBase::createVideoSinkGL()
>     GstElement* colorconvert = gst_element_factory_make("glcolorconvert", nullptr);
>     GstElement* appsink = createGLAppSink();
> 
>+    // glsinkbin is not used because it includes glcolorconvert which only process RGBA,
>+    // but in the future it would be possible to render YUV formats too:
>+    // https://bugs.webkit.org/show_bug.cgi?id=132869
>+
>     if (!appsink || !upload || !colorconvert) {
>         GST_WARNING("Failed to create GstGL elements");
>         gst_object_unref(videoSink);
>@@ -1073,10 +1072,11 @@ GstElement* MediaPlayerPrivateGStreamerBase::createVideoSinkGL()
> 
>     gst_bin_add_many(GST_BIN(videoSink), upload, colorconvert, appsink, nullptr);
> 
>-    GRefPtr<GstCaps> caps = adoptGRef(gst_caps_from_string("video/x-raw(" GST_CAPS_FEATURE_MEMORY_GL_MEMORY "), format = (string) " GST_GL_CAPS_FORMAT));
>+    GRefPtr<GstCaps> caps = adoptGRef(gst_caps_new_simple("video/x-raw", "format", G_TYPE_STRING, "RGBA", nullptr));
>+    gst_caps_set_features(caps.get(), 0, gst_caps_features_new(GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
>+    g_object_set(appsink, "caps", caps.get(), nullptr);
> 
>-    result &= gst_element_link_pads(upload, "src", colorconvert, "sink");
>-    result &= gst_element_link_pads_filtered(colorconvert, "src", appsink, "sink", caps.get());
>+    result &= gst_element_link_many(upload, colorconvert, appsink, nullptr);
> 
>     GRefPtr<GstPad> pad = adoptGRef(gst_element_get_static_pad(upload, "sink"));
>     gst_element_add_pad(videoSink, gst_ghost_pad_new("sink", pad.get()));
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
>index 980ea1986c443c777a512eb8bf129775fff4c1f5..cdaa176050386efbd6af467d0f2858cd0ae24c00 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
>@@ -306,7 +306,7 @@ protected:
>     bool m_waitingForKey { false };
> #endif
> 
>-    enum class WebKitGstVideoDecoderPlatform { ImxVPU, Video4Linux };
>+    enum class WebKitGstVideoDecoderPlatform { Video4Linux };
>     Optional<WebKitGstVideoDecoderPlatform> m_videoDecoderPlatform;
> };
> 
>diff --git a/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp
>index 135333ea1b515eb5f5101cba56dbd672d80837df..f870a5ef0a9f9b8ca56939888a6f7a0d63f4cb8b 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp
>@@ -84,6 +84,9 @@ void VideoTextureCopierGStreamer::updateColorConversionMatrix(ColorConversion co
>     case ColorConversion::ConvertARGBToRGBA:
>         m_colorConversionMatrix.setMatrix(0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 0.0);
>         break;
>+    case ColorConversion::NoConvert:
>+        m_colorConversion = false;
>+        break;
>     default:
>         RELEASE_ASSERT_NOT_REACHED();
>     }
>@@ -193,7 +196,8 @@ bool VideoTextureCopierGStreamer::copyVideoTextureToPlatformTexture(GLuint input
>     m_shaderProgram->setMatrix(m_shaderProgram->modelViewMatrixLocation(), m_modelViewMatrix);
>     m_shaderProgram->setMatrix(m_shaderProgram->projectionMatrixLocation(), m_projectionMatrix);
>     m_shaderProgram->setMatrix(m_shaderProgram->textureSpaceMatrixLocation(), m_textureSpaceMatrix);
>-    m_shaderProgram->setMatrix(m_shaderProgram->textureColorSpaceMatrixLocation(), m_colorConversionMatrix);
>+    if (m_colorConversion)
>+        m_shaderProgram->setMatrix(m_shaderProgram->textureColorSpaceMatrixLocation(), m_colorConversionMatrix);
> 
>     // Perform the copy.
> #if !USE(OPENGL_ES)
>diff --git a/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.h
>index ed1d58f76cf642adb461de98a928208d35f5cfee..8412714c95726949ff977b5dbfd57fcea704b68d 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.h
>+++ b/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.h
>@@ -36,7 +36,8 @@ class VideoTextureCopierGStreamer {
> public:
>     enum class ColorConversion {
>         ConvertBGRAToRGBA,
>-        ConvertARGBToRGBA
>+        ConvertARGBToRGBA,
>+        NoConvert,
>     };
> 
>     VideoTextureCopierGStreamer(ColorConversion);
>@@ -63,6 +64,7 @@ private:
>     TransformationMatrix m_textureSpaceMatrix;
>     TransformationMatrix m_colorConversionMatrix;
>     GLuint m_resultTexture { 0 };
>+    bool m_colorConversion { true };
> };
> 
> } // namespace WebCore

Actions: View | Formatted Diff | Diff

Attachments on bug 196966: 367520 | 373009 | 373013 | 373028 | 373228 | 373245 | 375229 | 375617