Changeset 80136 in webkit

Timestamp:

Mar 2, 2011 8:57:01 AM (13 years ago)

Author:

Philippe Normand

Message:

2011-03-01 Philippe Normand <​pnormand@igalia.com>

Reviewed by Eric Carlson.

[GStreamer] support in mac video fullscreen controller
​https://bugs.webkit.org/show_bug.cgi?id=52280

Factored the code to configure the video overlay in a new private
method of the controller and added GStreamer support to it.

• WebView/WebVideoFullscreenController.h:
• WebView/WebVideoFullscreenController.mm: (-[WebVideoFullscreenController setupVideoOverlay:]): (-[WebVideoFullscreenController windowDidLoad]): (-[WebVideoFullscreenController setMediaElement:WebCore::]): (-[WebVideoFullscreenController windowDidExitFullscreen]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebVideoFullscreenController.h (modified) (2 diffs)
• WebView/WebVideoFullscreenController.mm (modified) (5 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-03-01  Philippe Normand  <pnormand@igalia.com>
+
+        Reviewed by Eric Carlson.
+
+        [GStreamer] support in mac video fullscreen controller
+        https://bugs.webkit.org/show_bug.cgi?id=52280
+
+        Factored the code to configure the video overlay in a new private
+        method of the controller and added GStreamer support to it.
+
+        * WebView/WebVideoFullscreenController.h:
+        * WebView/WebVideoFullscreenController.mm:
+        (-[WebVideoFullscreenController setupVideoOverlay:]):
+        (-[WebVideoFullscreenController windowDidLoad]):
+        (-[WebVideoFullscreenController setMediaElement:WebCore::]):
+        (-[WebVideoFullscreenController windowDidExitFullscreen]):
+
 2011-02-23  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/Source/WebKit/mac/WebView/WebVideoFullscreenController.h

@@ -35 +35 @@
 @class WebVideoFullscreenHUDWindowController;
 @class WebWindowFadeAnimation;
+@class QTMovieLayer;
 
 @interface WebVideoFullscreenController : NSWindowController {
@@ -59 +60 @@
 - (void)setDelegate:(id <WebVideoFullscreenControllerDelegate>)delegate;
 
+- (void)setupVideoOverlay:(QTMovieLayer*)layer;
 - (void)setMediaElement:(WebCore::HTMLMediaElement*)mediaElement;
 - (WebCore::HTMLMediaElement*)mediaElement;

trunk/Source/WebKit/mac/WebView/WebVideoFullscreenController.mm

@@ -39 +39 @@
 #import <wtf/UnusedParam.h>
 
+#if USE(GSTREAMER)
+#import <WebCore/GStreamerGWorld.h>
+#endif
+
 SOFT_LINK_FRAMEWORK(QTKit)
 SOFT_LINK_CLASS(QTKit, QTMovieLayer)
@@ -97 +101 @@
 }
 
+- (void)setupVideoOverlay:(QTMovieLayer*)layer
+{
+    WebVideoFullscreenWindow *window = [self fullscreenWindow];
+#if USE(GSTREAMER)
+    if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::GStreamerGWorldType) {
+        WebCore::GStreamerGWorld* gstGworld = _mediaElement->platformMedia().media.gstreamerGWorld;
+        if (gstGworld->enterFullscreen())
+            [window setContentView:gstGworld->platformVideoWindow()->window()];
+    }
+#else
+    [[window contentView] setLayer:layer];
+    [[window contentView] setWantsLayer:YES];
+    if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::QTMovieType)
+        [layer setMovie:_mediaElement->platformMedia().media.qtMovie];
+#endif
+}
+
 - (void)windowDidLoad
 {
@@ -104 +125 @@
 #else
     WebVideoFullscreenWindow *window = [self fullscreenWindow];
-    QTMovieLayer *layer = [[getQTMovieLayerClass() alloc] init];
-    [[window contentView] setLayer:layer];
-    [[window contentView] setWantsLayer:YES];
-    if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::QTMovieType)
-        [layer setMovie:_mediaElement->platformMedia().media.qtMovie];
     [window setHasShadow:YES]; // This is nicer with a shadow.
     [window setLevel:NSPopUpMenuWindowLevel-1];
+
+    QTMovieLayer *layer = [[getQTMovieLayerClass() alloc] init];
+    [self setupVideoOverlay:layer];
     [layer release];
-    
+
+#if !USE(GSTREAMER)
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidResignActive:) name:NSApplicationDidResignActiveNotification object:NSApp];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidChangeScreenParameters:) name:NSApplicationDidChangeScreenParametersNotification object:NSApp];
+#endif
 #endif
 }
@@ -131 +152 @@
     _mediaElement = mediaElement;
     if ([self isWindowLoaded]) {
-        QTMovie *movie = _mediaElement->platformMedia().type == WebCore::PlatformMedia::QTMovieType ? _mediaElement->platformMedia().media.qtMovie : 0;
         QTMovieLayer *movieLayer = (QTMovieLayer *)[[[self fullscreenWindow] contentView] layer];
 
         ASSERT(movieLayer && [movieLayer isKindOfClass:[getQTMovieLayerClass() class]]);
-        ASSERT(movie);
-        [movieLayer setMovie:movie];
+        [self setupVideoOverlay:movieLayer];
+#if !USE(GSTREAMER)
+        ASSERT([movieLayer movie]);
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(rateChanged:) 
                                                      name:QTMovieRateDidChangeNotification 
-                                                   object:movie];
+                                                   object:[movieLayer movie]];
+#endif
     }
 #endif
@@ -167 +189 @@
 - (void)windowDidExitFullscreen
 {
+#if USE(GSTREAMER)
+    if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::GStreamerGWorldType)
+        _mediaElement->platformMedia().media.gstreamerGWorld->exitFullscreen();
+#endif
     [self clearFadeAnimation];
     [[self window] close];