Title: [259946] releases/WebKitGTK/webkit-2.28/Source/WebCore
- Revision
- 259946
- Author
- [email protected]
- Date
- 2020-04-12 06:02:54 -0700 (Sun, 12 Apr 2020)
Log Message
Merge r258199 - Unreviewed, !USE(GSTREAMER_GL) build fix after r258197.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::GstVideoFrameHolder::platformLayerBuffer):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (259945 => 259946)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-04-12 13:02:50 UTC (rev 259945)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-04-12 13:02:54 UTC (rev 259946)
@@ -1,3 +1,10 @@
+2020-03-10 Philippe Normand <[email protected]>
+
+ Unreviewed, !USE(GSTREAMER_GL) build fix after r258197.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::GstVideoFrameHolder::platformLayerBuffer):
+
2020-03-10 Philippe Normand <[email protected]>
[GStreamer][GL] External OES textures rendering support
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (259945 => 259946)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2020-04-12 13:02:50 UTC (rev 259945)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2020-04-12 13:02:54 UTC (rev 259946)
@@ -334,8 +334,10 @@
using Buffer = TextureMapperPlatformLayerBuffer;
+#if USE(GSTREAMER_GL)
if (m_textureTarget == GST_GL_TEXTURE_TARGET_EXTERNAL_OES)
return makeUnique<Buffer>(Buffer::TextureVariant { Buffer::ExternalOESTexture { m_textureID } }, m_size, m_flags, GL_DONT_CARE);
+#endif
if ((GST_VIDEO_INFO_IS_RGB(&m_videoFrame.info) && GST_VIDEO_INFO_N_PLANES(&m_videoFrame.info) == 1))
return makeUnique<Buffer>(Buffer::TextureVariant { Buffer::RGBTexture { m_textureID } }, m_size, m_flags, GL_RGBA);
@@ -401,7 +403,9 @@
Optional<GstVideoDecoderPlatform> m_videoDecoderPlatform;
TextureMapperGL::Flags m_flags { };
GLuint m_textureID { 0 };
+#if USE(GSTREAMER_GL)
GstGLTextureTarget m_textureTarget { GST_GL_TEXTURE_TARGET_NONE };
+#endif
bool m_isMapped { false };
bool m_hasMappedTextures { false };
#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
