Changeset 70048 in webkit

Timestamp:

Oct 19, 2010 5:15:52 AM (14 years ago)

Author:

Philippe Normand

Message:

2010-10-19 Philippe Normand <​pnormand@igalia.com>

Reviewed by Martin Robinson.

GStreamer PlatformVideoWindow needs an API to prepare the widget before applying the overlay
​https://bugs.webkit.org/show_bug.cgi?id=46790

Simple API addition to PlatformVideoWindow to allow
implementations to optionally prepare their own PlatformWidget
before applying the GStreamer XOverlay to it. This will likely be
needed on Mac OSX only.

• platform/graphics/gstreamer/GStreamerGWorld.cpp: (WebCore::GStreamerGWorld::setWindowOverlay):
• platform/graphics/gstreamer/PlatformVideoWindow.h:
• platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp: (PlatformVideoWindow::prepareForOverlay):
• platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp: (PlatformVideoWindow::prepareForOverlay):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/GStreamerGWorld.cpp (modified) (2 diffs)
• platform/graphics/gstreamer/PlatformVideoWindow.h (modified) (2 diffs)
• platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp (modified) (1 diff)
• platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-19  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        GStreamer PlatformVideoWindow needs an API to prepare the widget before applying the overlay
+        https://bugs.webkit.org/show_bug.cgi?id=46790
+
+        Simple API addition to PlatformVideoWindow to allow
+        implementations to optionally prepare their own PlatformWidget
+        before applying the GStreamer XOverlay to it. This will likely be
+        needed on Mac OSX only.
+
+        * platform/graphics/gstreamer/GStreamerGWorld.cpp:
+        (WebCore::GStreamerGWorld::setWindowOverlay):
+        * platform/graphics/gstreamer/PlatformVideoWindow.h:
+        * platform/graphics/gstreamer/PlatformVideoWindowGtk.cpp:
+        (PlatformVideoWindow::prepareForOverlay):
+        * platform/graphics/gstreamer/PlatformVideoWindowEfl.cpp:
+        (PlatformVideoWindow::prepareForOverlay):
+
 2010-10-19  Ben Murdoch  <benm@google.com>
 

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

@@ -195 +195 @@
         g_object_set(sink, "force-aspect-ratio", TRUE, NULL);
 
-    if (m_videoWindow)
+    if (m_videoWindow) {
+        m_videoWindow->prepareForOverlay(message);
 #if GST_CHECK_VERSION(0, 10, 31) || GST_VERSION_NANO
         gst_x_overlay_set_window_handle(GST_X_OVERLAY(sink), m_videoWindow->videoWindowId());
@@ -201 +202 @@
         gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(sink), m_videoWindow->videoWindowId());
 #endif
+    }
 }
 

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

@@ -26 +26 @@
 #include <wtf/RefCounted.h>
 
+typedef struct _GstMessage GstMessage;
+
 namespace WebCore {
 
@@ -35 +37 @@
         ~PlatformVideoWindow();
 
+
+        void prepareForOverlay(GstMessage*);
         PlatformWidget window() const { return m_window; }
         unsigned long videoWindowId() const { return m_videoWindowId; }

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

@@ -36 +36 @@
 }
 
+void PlatformVideoWindow::prepareForOverlay(GstMessage*)
+{
+}
+
 #endif // USE(GSTREAMER)

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

@@ -62 +62 @@
     m_videoWindowId = 0;
 }
+
+void PlatformVideoWindow::prepareForOverlay(GstMessage*)
+{
+}
 #endif // USE(GSTREAMER)
+