Modified: trunk/LayoutTests/ChangeLog (151732 => 151733)
--- trunk/LayoutTests/ChangeLog 2013-06-19 14:23:34 UTC (rev 151732)
+++ trunk/LayoutTests/ChangeLog 2013-06-19 15:03:56 UTC (rev 151733)
@@ -1,3 +1,13 @@
+2013-06-19 Víctor Manuel Jáquez Leal <[email protected]>
+
+ [GStreamer] [texmap] the bytesPerLine is wrong when updating the texture
+ https://bugs.webkit.org/show_bug.cgi?id=117551
+
+ Reviewed by Philippe Normand.
+
+ * platform/gtk-wk2/TestExpectations:
+ enabled media/video-display-aspect-ratio.html
+
2013-06-19 Zoltan Arvai <[email protected]>
[Qt] Unreviewed rebaselining after 151705.
Modified: trunk/LayoutTests/platform/gtk-wk2/TestExpectations (151732 => 151733)
--- trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2013-06-19 14:23:34 UTC (rev 151732)
+++ trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2013-06-19 15:03:56 UTC (rev 151733)
@@ -226,8 +226,6 @@
webkit.org/b/116974 accessibility/title-ui-element-correctness.html [ Crash ]
-webkit.org/b/117551 media/video-display-aspect-ratio.html [ Crash Pass ]
-
#////////////////////////////////////////////////////////////////////////////////////////
# End of Crashing tests
#////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/Source/WebCore/ChangeLog (151732 => 151733)
--- trunk/Source/WebCore/ChangeLog 2013-06-19 14:23:34 UTC (rev 151732)
+++ trunk/Source/WebCore/ChangeLog 2013-06-19 15:03:56 UTC (rev 151733)
@@ -1,3 +1,21 @@
+2013-06-19 Víctor Manuel Jáquez Leal <[email protected]>
+
+ [GStreamer] [texmap] the bytesPerLine is wrong when updating the texture
+ https://bugs.webkit.org/show_bug.cgi?id=117551
+
+ Reviewed by Philippe Normand.
+
+ The bytesPerLine (or stride) is wrong when updating the texture
+ content. This is because the naturalSize() is not updated to the
+ current buffer. This patch extracts the current value of the size and
+ the stride.
+
+ No tests required.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::updateTexture):
+ (WebCore::MediaPlayerPrivateGStreamerBase::paintToTextureMapper):
+
2013-06-19 Andre Moreira Magalhaes <[email protected]>
Adjust internal size on gstreamer source element when receiving data if necessary
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (151732 => 151733)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2013-06-19 14:23:34 UTC (rev 151732)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2013-06-19 15:03:56 UTC (rev 151733)
@@ -334,8 +334,20 @@
return;
const void* srcData = 0;
- IntSize size = naturalSize();
+#ifdef GST_API_VERSION_1
+ GRefPtr<GstCaps> caps = currentVideoSinkCaps();
+#else
+ GRefPtr<GstCaps> caps = GST_BUFFER_CAPS(buffer);
+#endif
+ if (!caps)
+ return;
+ IntSize size;
+ GstVideoFormat format;
+ int pixelAspectRatioNumerator, pixelAspectRatioDenominator, stride;
+ if (!getVideoSizeAndFormatFromCaps(caps.get(), size, format, pixelAspectRatioNumerator, pixelAspectRatioDenominator, stride))
+ return;
+
if (m_texture->size() != size)
m_texture->reset(size);
@@ -362,7 +374,7 @@
srcData = GST_BUFFER_DATA(buffer);
#endif
- m_texture->updateContents(srcData, WebCore::IntRect(WebCore::IntPoint(0, 0), size), WebCore::IntPoint(0, 0), size.width() * 4, BitmapTexture::UpdateCannotModifyOriginalImageData);
+ m_texture->updateContents(srcData, WebCore::IntRect(WebCore::IntPoint(0, 0), size), WebCore::IntPoint(0, 0), stride, BitmapTexture::UpdateCannotModifyOriginalImageData);
#ifdef GST_API_VERSION_1
gst_buffer_unmap(buffer, &srcInfo);
@@ -440,6 +452,9 @@
if (textureMapper->accelerationMode() != TextureMapper::OpenGLMode)
return;
+ if (!m_player->visible())
+ return;
+
if (!m_texture) {
m_texture = textureMapper->acquireTextureFromPool(naturalSize());
return;