Attachment 347070 Details for Bug 188552 – Patch

[patch] Patch

bug-188552-20180814141509.patch (text/plain), 3.72 KB, created by Philippe Normand on 2018-08-14 06:15:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Normand

Created: 2018-08-14 06:15:10 PDT

Size: 3.72 KB

patch

obsolete

>Subversion Revision: 234842
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 59c416ac9000e1a2447236c0920ba3853ab2c4c8..d9fd685d0a4c97f45bcd097235b084f3adc10b8b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-08-14  Philippe Normand  <philn@igalia.com>
>+
>+        [GStreamer][GL] useless ifdef in pushTextureToCompositor
>+        https://bugs.webkit.org/show_bug.cgi?id=188552
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
>+        (WebCore::MediaPlayerPrivateGStreamerBase::pushTextureToCompositor):
>+        There's no need for a ifdef because the frame holder already
>+        ensures a valid texture ID will set if it maps a GL video frame.
>+
> 2018-08-14  Rob Buis  <rbuis@igalia.com>
> 
>         Fetch: content-length header is being added to the safe-list
>diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>index 49ccf86445f49f585122a1acd7a31a4cf2d3ce37..0b6f47722f9d906466ec74f5c3678aa9df1942ad 100644
>--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
>@@ -783,25 +783,22 @@ void MediaPlayerPrivateGStreamerBase::pushTextureToCompositor()
> 
>             std::unique_ptr<GstVideoFrameHolder> frameHolder = std::make_unique<GstVideoFrameHolder>(m_sample.get(), texMapFlagFromOrientation(m_videoSourceOrientation), !m_usingFallbackVideoSink);
> 
>-#if USE(GSTREAMER_GL)
>             GLuint textureID = frameHolder->textureID();
>+            std::unique_ptr<TextureMapperPlatformLayerBuffer> layerBuffer;
>             if (textureID) {
>-                std::unique_ptr<TextureMapperPlatformLayerBuffer> layerBuffer = std::make_unique<TextureMapperPlatformLayerBuffer>(textureID, frameHolder->size(), frameHolder->flags(), GraphicsContext3D::RGBA);
>+                layerBuffer = std::make_unique<TextureMapperPlatformLayerBuffer>(textureID, frameHolder->size(), frameHolder->flags(), GraphicsContext3D::RGBA);
>                 layerBuffer->setUnmanagedBufferDataHolder(WTFMove(frameHolder));
>-                proxy.pushNextBuffer(WTFMove(layerBuffer));
>-            } else
>-#endif
>-            {
>-                std::unique_ptr<TextureMapperPlatformLayerBuffer> buffer = proxy.getAvailableBuffer(frameHolder->size(), GL_DONT_CARE);
>-                if (UNLIKELY(!buffer)) {
>+            } else {
>+                layerBuffer = proxy.getAvailableBuffer(frameHolder->size(), GL_DONT_CARE);
>+                if (UNLIKELY(!layerBuffer)) {
>                     auto texture = BitmapTextureGL::create(TextureMapperContextAttributes::get());
>                     texture->reset(frameHolder->size(), frameHolder->hasAlphaChannel() ? BitmapTexture::SupportsAlpha : BitmapTexture::NoFlag);
>-                    buffer = std::make_unique<TextureMapperPlatformLayerBuffer>(WTFMove(texture));
>+                    layerBuffer = std::make_unique<TextureMapperPlatformLayerBuffer>(WTFMove(texture));
>                 }
>-                frameHolder->updateTexture(buffer->textureGL());
>-                buffer->setExtraFlags(texMapFlagFromOrientation(m_videoSourceOrientation) | (frameHolder->hasAlphaChannel() ? TextureMapperGL::ShouldBlend : 0));
>-                proxy.pushNextBuffer(WTFMove(buffer));
>+                frameHolder->updateTexture(layerBuffer->textureGL());
>+                layerBuffer->setExtraFlags(texMapFlagFromOrientation(m_videoSourceOrientation) | (frameHolder->hasAlphaChannel() ? TextureMapperGL::ShouldBlend : 0));
>             }
>+            proxy.pushNextBuffer(WTFMove(layerBuffer));
>         };
> 
> #if USE(NICOSIA)

Flags:

calvaris: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188552: 347070