Modified: trunk/Source/WebCore/ChangeLog (150034 => 150035)
--- trunk/Source/WebCore/ChangeLog 2013-05-13 20:07:20 UTC (rev 150034)
+++ trunk/Source/WebCore/ChangeLog 2013-05-13 20:29:52 UTC (rev 150035)
@@ -1,3 +1,18 @@
+2013-05-13 Philippe Normand <[email protected]>
+
+ Unreviewed, rolling out r150014.
+ http://trac.webkit.org/changeset/150014
+ https://bugs.webkit.org/show_bug.cgi?id=86410
+
+ Broke video playback on WK2 and some webgl tests
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):
+ (WebCore::MediaPlayerPrivateGStreamerBase::triggerRepaint):
+ (WebCore::MediaPlayerPrivateGStreamerBase::paint):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+ (MediaPlayerPrivateGStreamerBase):
+
2013-05-13 Christophe Dumez <[email protected]>
Unreviewed, rolling out r150022.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (150034 => 150035)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2013-05-13 20:07:20 UTC (rev 150034)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2013-05-13 20:29:52 UTC (rev 150035)
@@ -111,9 +111,6 @@
, m_repaintHandler(0)
, m_volumeSignalHandler(0)
, m_muteSignalHandler(0)
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
- , m_texture(0)
-#endif
{
}
@@ -300,54 +297,11 @@
m_muteTimerHandler = g_timeout_add(0, reinterpret_cast<GSourceFunc>(mediaPlayerPrivateMuteChangeTimeoutCallback), this);
}
-
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
-void MediaPlayerPrivateGStreamerBase::updateTexture(GstBuffer* buffer)
-{
- if (!m_texture)
- return;
-
- if (!client())
- return;
-
- const void* srcData = 0;
- IntSize size = naturalSize();
-
- if (m_texture->size() != size)
- m_texture->reset(size);
-
-#ifdef GST_API_VERSION_1
- GstMapInfo srcInfo;
- gst_buffer_map(buffer, &srcInfo, GST_MAP_READ);
- srcData = srcInfo.data;
-#else
- srcData = GST_BUFFER_DATA(buffer);
-#endif
-
- // @TODO: support cropping
- m_texture->updateContents(srcData, WebCore::IntRect(WebCore::IntPoint(0, 0), size), WebCore::IntPoint(0, 0), size.width() * 4, BitmapTexture::UpdateCannotModifyOriginalImageData);
-
-#ifdef GST_API_VERSION_1
- gst_buffer_unmap(buffer, &srcInfo);
-#endif
-
- client()->setPlatformLayerNeedsDisplay();
-}
-#endif
-
void MediaPlayerPrivateGStreamerBase::triggerRepaint(GstBuffer* buffer)
{
g_return_if_fail(GST_IS_BUFFER(buffer));
-
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
- if (supportsAcceleratedRendering() && m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player))
- updateTexture(buffer);
- else
-#endif
- {
- gst_buffer_replace(&m_buffer, buffer);
- m_player->repaint();
- }
+ gst_buffer_replace(&m_buffer, buffer);
+ m_player->repaint();
}
void MediaPlayerPrivateGStreamerBase::setSize(const IntSize& size)
@@ -357,11 +311,6 @@
void MediaPlayerPrivateGStreamerBase::paint(GraphicsContext* context, const IntRect& rect)
{
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
- if (m_texture)
- return;
-#endif
-
if (context->paintingDisabled())
return;
@@ -383,21 +332,6 @@
rect, gstImage->rect(), CompositeCopy, DoNotRespectImageOrientation, false);
}
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
-void MediaPlayerPrivateGStreamerBase::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
-{
- if (textureMapper->accelerationMode() != TextureMapper::OpenGLMode)
- return;
-
- if (!m_texture) {
- m_texture = textureMapper->acquireTextureFromPool(naturalSize());
- return;
- }
-
- textureMapper->drawTexture(*m_texture.get(), targetRect, matrix, opacity);
-}
-#endif
-
#if USE(NATIVE_FULLSCREEN_VIDEO)
void MediaPlayerPrivateGStreamerBase::enterFullscreen()
{
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (150034 => 150035)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2013-05-13 20:07:20 UTC (rev 150034)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2013-05-13 20:29:52 UTC (rev 150035)
@@ -29,10 +29,6 @@
#include <wtf/Forward.h>
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
-#include "TextureMapperPlatformLayer.h"
-#endif
-
typedef struct _GstBuffer GstBuffer;
typedef struct _GstElement GstElement;
typedef struct _GstMessage GstMessage;
@@ -47,11 +43,7 @@
class IntRect;
class GStreamerGWorld;
-class MediaPlayerPrivateGStreamerBase : public MediaPlayerPrivateInterface
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
- , public TextureMapperPlatformLayer
-#endif
-{
+class MediaPlayerPrivateGStreamerBase : public MediaPlayerPrivateInterface {
public:
~MediaPlayerPrivateGStreamerBase();
@@ -101,12 +93,6 @@
unsigned audioDecodedByteCount() const;
unsigned videoDecodedByteCount() const;
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
- virtual PlatformLayer* platformLayer() const { return const_cast<MediaPlayerPrivateGStreamerBase*>(this); }
- virtual bool supportsAcceleratedRendering() const { return true; }
- virtual void paintToTextureMapper(TextureMapper*, const FloatRect&, const TransformationMatrix&, float);
-#endif
-
protected:
MediaPlayerPrivateGStreamerBase(MediaPlayer*);
GstElement* createVideoSink(GstElement* pipeline);
@@ -133,10 +119,6 @@
unsigned long m_muteSignalHandler;
GRefPtr<GstPad> m_videoSinkPad;
mutable IntSize m_videoSize;
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
- void updateTexture(GstBuffer*);
- RefPtr<BitmapTexture> m_texture;
-#endif
};
}
