ChangeLog

2013-06-07  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>

        [GStreamer] [texmap] upload a video buffer into the video texture

        https://bugs.webkit.org/show_bug.cgi?id=116042

        Reviewed by NOBODY (OOPS!).

        Handle the new buffer's metadata available in GStreamer 1.2 for

        uploading buffers into a texture.

        If the decoder provides buffers with this metadata, the buffer will be

        uploaded into the texture used for the video display and it will be

        rendered, avoiding a expensive mem copies. This is particularly useful

        for Full HD videos, where all the processing and display will be done

        in the GPU.

        No new tests, covered by existing tests.

        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:

        (WebCore::MediaPlayerPrivateGStreamerBase::MediaPlayerPrivateGStreamerBase):

        (WebCore::MediaPlayerPrivateGStreamerBase::updateTexture):

        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:

        * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:

        (webkitVideoSinkProposeAllocation):

2013-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>

        Make CachedResource virtual methods overridden in derived classes private

Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

#include <gst/interfaces/streamvolume.h>

#endif

#ifdef GST_API_VERSION_1

#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)

#include "TextureMapperGL.h"

#endif

#endif

GST_DEBUG_CATEGORY(webkit_media_player_debug);

#define GST_CAT_DEFAULT webkit_media_player_debug

@@void MediaPlayerPrivateGStreamerBase::updateTexture(GstBuffer* buffer)

    if (m_texture->size() != size)

        m_texture->reset(size);

#if GST_CHECK_VERSION(1, 1, 0)

    GstVideoGLTextureUploadMeta* meta = gst_buffer_get_video_gl_texture_upload_meta(buffer);

    bool ret = false;

    if (meta) {

        const BitmapTextureGL* textureGL = static_cast<const BitmapTextureGL*>(m_texture.get());

        guint ids[4] = { textureGL->id(), 0, 0, 0 };

        ret = gst_video_gl_texture_upload_meta_upload(meta, ids);

    }

    if (!ret) // fallback

#endif

    { // copy the buffer into the texture

342363#ifdef GST_API_VERSION_1

    GstMapInfo srcInfo;

    gst_buffer_map(buffer, &srcInfo, GST_MAP_READ);

    srcData = srcInfo.data;

        GstMapInfo srcInfo;

        gst_buffer_map(buffer, &srcInfo, GST_MAP_READ);

        srcData = srcInfo.data;

346367#else

347 srcData = GST_BUFFER_DATA(buffer);

368 srcData = GST_BUFFER_DATA(buffer);

348369#endif

349370

350 // @TODO: support cropping

351 m_texture->updateContents(srcData, WebCore::IntRect(WebCore::IntPoint(0, 0), size), WebCore::IntPoint(0, 0), size.width() * 4, BitmapTexture::UpdateCannotModifyOriginalImageData);

371 // @TODO: support cropping

372 m_texture->updateContents(srcData, WebCore::IntRect(WebCore::IntPoint(0, 0), size), WebCore::IntPoint(0, 0), size.width() * 4, BitmapTexture::UpdateCannotModifyOriginalImageData);

352373

353374#ifdef GST_API_VERSION_1

354 gst_buffer_unmap(buffer, &srcInfo);

375 gst_buffer_unmap(buffer, &srcInfo);

355376#endif

377 }

    client()->setPlatformLayerNeedsDisplay();

}

Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp

#endif

#include <wtf/FastAllocBase.h>

#if GST_CHECK_VERSION(1, 1, 0)

#define GST_SURFACE_CAPS "video/x-surface, opengl=true; "

#else

#define GST_SURFACE_CAPS

#endif

// CAIRO_FORMAT_RGB24 used to render the video buffers is little/big endian dependant.

#if G_BYTE_ORDER == G_LITTLE_ENDIAN

#ifndef GST_API_VERSION_1

#define WEBKIT_VIDEO_SINK_PAD_CAPS GST_VIDEO_CAPS_BGRx ";" GST_VIDEO_CAPS_BGRA

#else

48 #define WEBKIT_VIDEO_SINK_PAD_CAPS GST_VIDEO_CAPS_MAKE("{ BGRx, BGRA }")

54#define WEBKIT_VIDEO_SINK_PAD_CAPS GST_SURFACE_CAPS GST_VIDEO_CAPS_MAKE("{ BGRx, BGRA }")

#endif

#else

#ifndef GST_API_VERSION_1

#define WEBKIT_VIDEO_SINK_PAD_CAPS GST_VIDEO_CAPS_xRGB ";" GST_VIDEO_CAPS_ARGB

#else

54 #define WEBKIT_VIDEO_SINK_PAD_CAPS GST_VIDEO_CAPS_MAKE("{ xRGB, ARGB }")

60#define WEBKIT_VIDEO_SINK_PAD_CAPS GST_SURFACE_CAPS GST_VIDEO_CAPS_MAKE("{ xRGB, ARGB }")

#endif

#endif

static GstStaticPadTemplate s_sinkTemplate = GST_STATIC_PAD_TEMPLATE("sink", GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS(WEBKIT_VIDEO_SINK_PAD_CAPS));

@@static gboolean webkitVideoSinkProposeAllocation(GstBaseSink* baseSink, GstQuery

    gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, 0);

    gst_query_add_allocation_meta(query, GST_VIDEO_CROP_META_API_TYPE, 0);

#if GST_CHECK_VERSION(1, 1, 0)

    gst_query_add_allocation_meta(query, GST_VIDEO_GL_TEXTURE_UPLOAD_META_API_TYPE, 0);

#endif

    return TRUE;

}

#endif