Title: [191549] trunk/Source/WebCore
- Revision
- 191549
- Author
- y...@igalia.com
- Date
- 2015-10-25 08:10:29 -0700 (Sun, 25 Oct 2015)
Log Message
[TexMap] Fix a misused flag for GstGL
https://bugs.webkit.org/show_bug.cgi?id=150545
Reviewed by Žan Doberšek.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::paintToTextureMapper):
We should pass TextureMapperGL::Flags to the TextureMapperGL::drawTexture instead of
BitmapTexture::Flags.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (191548 => 191549)
--- trunk/Source/WebCore/ChangeLog 2015-10-25 09:17:32 UTC (rev 191548)
+++ trunk/Source/WebCore/ChangeLog 2015-10-25 15:10:29 UTC (rev 191549)
@@ -1,3 +1,15 @@
+2015-10-25 Gwang Yoon Hwang <y...@igalia.com>
+
+ [TexMap] Fix a misused flag for GstGL
+ https://bugs.webkit.org/show_bug.cgi?id=150545
+
+ Reviewed by Žan Doberšek.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::paintToTextureMapper):
+ We should pass TextureMapperGL::Flags to the TextureMapperGL::drawTexture instead of
+ BitmapTexture::Flags.
+
2015-10-25 Youenn Fablet <youenn.fab...@crf.canon.fr>
Use ImplementedAs for MediaDevices.getUserMediaFromJS
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (191548 => 191549)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-10-25 09:17:32 UTC (rev 191548)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-10-25 15:10:29 UTC (rev 191549)
@@ -560,9 +560,7 @@
return;
unsigned textureID = *reinterpret_cast<unsigned*>(videoFrame.data[0]);
- BitmapTexture::Flags flags = BitmapTexture::NoFlag;
- if (GST_VIDEO_INFO_HAS_ALPHA(&videoInfo))
- flags |= BitmapTexture::SupportsAlpha;
+ TextureMapperGL::Flags flags = GST_VIDEO_INFO_HAS_ALPHA(&videoInfo) ? TextureMapperGL::ShouldBlend : 0;
IntSize size = IntSize(GST_VIDEO_INFO_WIDTH(&videoInfo), GST_VIDEO_INFO_HEIGHT(&videoInfo));
TextureMapperGL* textureMapperGL = reinterpret_cast<TextureMapperGL*>(textureMapper);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
