Changeset 56354 in webkit

Timestamp:

Mar 22, 2010 12:37:17 PM (14 years ago)

Author:

Philippe Normand

Message:

2010-03-22 Philippe Normand <​pnormand@igalia.com>

Reviewed by Eric Carlson.

[GStreamer] Use ImageBuffer API to do painting
​https://bugs.webkit.org/show_bug.cgi?id=35783

New ImageGStreamer class abstracting the conversion of GStreamer
buffers to cairo surfaces. Using this makes the painting code of
the player more generic.

• GNUmakefile.am:
• platform/graphics/gstreamer/ImageGStreamer.h: Added. (WebCore::ImageGStreamer::image):
• platform/graphics/gstreamer/ImageGStreamerCairo.cpp: Added. (ImageGStreamer::createImage): (ImageGStreamer::ImageGStreamer): (ImageGStreamer::~ImageGStreamer):
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivate::paint):
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (1 diff)
• platform/graphics/gstreamer/ImageGStreamer.h (added)
• platform/graphics/gstreamer/ImageGStreamerCairo.cpp (added)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (modified) (3 diffs)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-22  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Eric Carlson.
+
+        [GStreamer] Use ImageBuffer API to do painting
+        https://bugs.webkit.org/show_bug.cgi?id=35783
+
+        New ImageGStreamer class abstracting the conversion of GStreamer
+        buffers to cairo surfaces. Using this makes the painting code of
+        the player more generic.
+
+        * GNUmakefile.am:
+        * platform/graphics/gstreamer/ImageGStreamer.h: Added.
+        (WebCore::ImageGStreamer::image):
+        * platform/graphics/gstreamer/ImageGStreamerCairo.cpp: Added.
+        (ImageGStreamer::createImage):
+        (ImageGStreamer::ImageGStreamer):
+        (ImageGStreamer::~ImageGStreamer):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::paint):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+
 2010-03-22  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/GNUmakefile.am

@@ -2474 +2474 @@
         WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp \
         WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.h \
+        WebCore/platform/graphics/gstreamer/ImageGStreamer.h \
+        WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp \
         WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp \
         WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h

trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

@@ -29 +29 @@
 
 
+#include "ColorSpace.h"
 #include "CString.h"
 #include "DataSourceGStreamer.h"
@@ -36 +37 @@
 #include "GOwnPtrGStreamer.h"
 #include "GraphicsContext.h"
+#include "GraphicsTypes.h"
+#include "ImageGStreamer.h"
 #include "IntRect.h"
 #include "KURL.h"
@@ -1205 +1208 @@
         return;
 
-    int width = 0, height = 0;
-    GstCaps* caps = gst_buffer_get_caps(m_buffer);
-    GstVideoFormat format;
-
-    if (!gst_video_format_parse_caps(caps, &format, &width, &height)) {
-      gst_caps_unref(caps);
-      return;
-    }
-
-    cairo_format_t cairoFormat;
-    if (format == GST_VIDEO_FORMAT_ARGB || format == GST_VIDEO_FORMAT_BGRA)
-        cairoFormat = CAIRO_FORMAT_ARGB32;
-    else
-        cairoFormat = CAIRO_FORMAT_RGB24;
-
-    cairo_t* cr = context->platformContext();
-    cairo_surface_t* src = cairo_image_surface_create_for_data(GST_BUFFER_DATA(m_buffer),
-                                                               cairoFormat,
-                                                               width, height,
-                                                               4 * width);
-
-    cairo_save(cr);
-
-    // translate and scale the context to correct size
-    cairo_translate(cr, rect.x(), rect.y());
-    cairo_scale(cr, static_cast<double>(rect.width()) / width, static_cast<double>(rect.height()) / height);
-
-    // And paint it.
-    cairo_set_source_surface(cr, src, 0, 0);
-    cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_PAD);
-    cairo_rectangle(cr, 0, 0, width, height);
-    cairo_fill(cr);
-    cairo_restore(cr);
-
-    cairo_surface_destroy(src);
-    gst_caps_unref(caps);
+    RefPtr<ImageGStreamer> gstImage = ImageGStreamer::createImage(m_buffer);
+    if (!gstImage)
+        return;
+
+    context->drawImage(reinterpret_cast<Image*>(gstImage->image().get()), sRGBColorSpace,
+                       rect, CompositeCopy, false);
 }
 

trunk/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h

@@ -29 +29 @@
 #include "Timer.h"
 
-#include <cairo.h>
 #include <glib.h>
 #include <gst/gst.h>