Changeset 278740 in webkit

Timestamp:

Jun 10, 2021, 4:51:37 PM (4 years ago)

Author:

eric.carlson@apple.com

Message:

[Cocoa] Remote video layer should respect video gravity when resizing
​https://bugs.webkit.org/show_bug.cgi?id=226784

Reviewed by Jer Noble.

Tested manually.

• WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:

(WebKit::MediaPlayerPrivateRemote::prepareForPlayback): Pass specify video gravity
when creating remote layer.
(WebKit::MediaPlayerPrivateRemote::setVideoFullscreenGravity): Remember gravity.

• WebProcess/GPU/media/MediaPlayerPrivateRemote.h:

• WebProcess/GPU/media/VideoLayerRemote.h:
• WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.h:
• WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.mm:

(-[WKVideoLayerRemote videoGravity]):
(-[WKVideoLayerRemote setVideoGravity:]):
(-[WKVideoLayerRemote resizePreservingGravity]): Return true when in PiP, fullscreen,
or when video gravity is not "resize".
(-[WKVideoLayerRemote layoutSublayers]): Preserve aspect ration when appropriate.
(WebKit::createVideoLayerRemote):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (modified) (2 diffs)
• WebProcess/GPU/media/MediaPlayerPrivateRemote.h (modified) (1 diff)
• WebProcess/GPU/media/VideoLayerRemote.h (modified) (2 diffs)
• WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.h (modified) (2 diffs)
• WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.mm (modified) (5 diffs)
• WebProcess/GPU/media/win/VideoLayerRemoteWin.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-10  Eric Carlson  <eric.carlson@apple.com>
+
+        [Cocoa] Remote video layer should respect video gravity when resizing
+        https://bugs.webkit.org/show_bug.cgi?id=226784
+
+        Reviewed by Jer Noble.
+
+        Tested manually.
+
+        * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+        (WebKit::MediaPlayerPrivateRemote::prepareForPlayback): Pass specify video gravity
+        when creating remote layer.
+        (WebKit::MediaPlayerPrivateRemote::setVideoFullscreenGravity): Remember gravity.
+        * WebProcess/GPU/media/MediaPlayerPrivateRemote.h:
+
+        * WebProcess/GPU/media/VideoLayerRemote.h:
+        * WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.h:
+        * WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.mm:
+        (-[WKVideoLayerRemote videoGravity]):
+        (-[WKVideoLayerRemote setVideoGravity:]):
+        (-[WKVideoLayerRemote resizePreservingGravity]): Return true when in PiP, fullscreen,
+        or when video gravity is not "resize".
+        (-[WKVideoLayerRemote layoutSublayers]): Preserve aspect ration when appropriate.
+        (WebKit::createVideoLayerRemote):
+
 2021-06-10  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp

@@ -152 +152 @@
             return;
 
-        m_videoLayer = createVideoLayerRemote(this, inlineLayerHostingContextId.value());
+        m_videoLayer = createVideoLayerRemote(this, inlineLayerHostingContextId.value(), m_videoFullscreenGravity);
 #if PLATFORM(COCOA)
         m_videoLayerManager->setVideoLayer(m_videoLayer.get(), snappedIntRect(player->playerContentBoxRect()).size());
@@ -816 +816 @@
 void MediaPlayerPrivateRemote::setVideoFullscreenGravity(WebCore::MediaPlayerEnums::VideoGravity gravity)
 {
+    m_videoFullscreenGravity = gravity;
     connection().send(Messages::RemoteMediaPlayerProxy::SetVideoFullscreenGravity(gravity), m_id);
 }

trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h

@@ -427 +427 @@
     MonotonicTime m_cachedMediaTimeQueryTime;
 
+    WebCore::MediaPlayer::VideoGravity m_videoFullscreenGravity { WebCore::MediaPlayer::VideoGravity::ResizeAspect };
     MonotonicTime m_lastPlaybackQualityMetricsQueryTime;
     Seconds m_videoPlaybackMetricsUpdateInterval;

trunk/Source/WebKit/WebProcess/GPU/media/VideoLayerRemote.h

@@ -29 +29 @@
 
 #include "LayerHostingContext.h"
+#include <WebCore/MediaPlayerEnums.h>
 #include <WebCore/PlatformLayer.h>
 
@@ -35 +36 @@
 class MediaPlayerPrivateRemote;
 
-PlatformLayerContainer createVideoLayerRemote(MediaPlayerPrivateRemote*, LayerHostingContextID);
+PlatformLayerContainer createVideoLayerRemote(MediaPlayerPrivateRemote*, LayerHostingContextID, WebCore::MediaPlayerEnums::VideoGravity);
 
 } // namespace WebKit

trunk/Source/WebKit/WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.h

@@ -27 +27 @@
 
 #import <QuartzCore/CALayer.h>
+#import <WebCore/MediaPlayerEnums.h>
 
 namespace WebKit {
@@ -35 +36 @@
 @property (nonatomic) WebKit::MediaPlayerPrivateRemote* mediaPlayerPrivateRemote;
 @property (nonatomic) CGRect videoLayerFrame;
+@property (nonatomic) WebCore::MediaPlayerEnums::VideoGravity videoGravity;
 @end
 

trunk/Source/WebKit/WebProcess/GPU/media/cocoa/VideoLayerRemoteCocoa.mm

@@ -46 +46 @@
     WeakPtr<WebKit::MediaPlayerPrivateRemote> _mediaPlayerPrivateRemote;
     RetainPtr<CAContext> _context;
+    WebCore::MediaPlayerEnums::VideoGravity _videoGravity;
 
     std::unique_ptr<WebCore::Timer> _resolveBoundsTimer;
@@ -81 +82 @@
 }
 
+- (WebCore::MediaPlayerEnums::VideoGravity)videoGravity
+{
+    return _videoGravity;
+}
+
+- (void)setVideoGravity:(WebCore::MediaPlayerEnums::VideoGravity)videoGravity
+{
+    _videoGravity = videoGravity;
+}
+
+- (bool)resizePreservingGravity
+{
+    auto* player = self.mediaPlayerPrivateRemote;
+    if (player && player->inVideoFullscreenOrPictureInPicture())
+        return true;
+    
+    return _videoGravity != WebCore::MediaPlayer::VideoGravity::Resize;
+}
+
 - (void)layoutSublayers
 {
@@ -94 +114 @@
     CGAffineTransform transform = CGAffineTransformIdentity;
     if (!sourceVideoFrame.isEmpty()) {
-        if (auto* mediaPlayerPrivateRemote = self.mediaPlayerPrivateRemote; mediaPlayerPrivateRemote && mediaPlayerPrivateRemote->inVideoFullscreenOrPictureInPicture()) {
+        if ([self resizePreservingGravity]) {
             auto scale = std::fmax(targetVideoFrame.width() / sourceVideoFrame.width(), targetVideoFrame.height() / sourceVideoFrame.height());
             transform = CGAffineTransformMakeScale(scale, scale);
@@ -159 +179 @@
 namespace WebKit {
 
-PlatformLayerContainer createVideoLayerRemote(MediaPlayerPrivateRemote* mediaPlayerPrivateRemote, LayerHostingContextID contextId)
+PlatformLayerContainer createVideoLayerRemote(MediaPlayerPrivateRemote* mediaPlayerPrivateRemote, LayerHostingContextID contextId, WebCore::MediaPlayerEnums::VideoGravity videoGravity)
 {
     // Initially, all the layers will be empty (both width and height are 0) and invisible.
@@ -165 +185 @@
     auto videoLayerRemote = adoptNS([[WKVideoLayerRemote alloc] init]);
     [videoLayerRemote setName:@"WKVideoLayerRemote"];
+    [videoLayerRemote setVideoGravity:videoGravity];
     [videoLayerRemote setMediaPlayerPrivateRemote:mediaPlayerPrivateRemote];
     [videoLayerRemote addSublayer:LayerHostingContext::createPlatformLayerForHostingContext(contextId).get()];

trunk/Source/WebKit/WebProcess/GPU/media/win/VideoLayerRemoteWin.cpp

@@ -34 +34 @@
 namespace WebKit {
 
-PlatformLayerContainer createVideoLayerRemote(MediaPlayerPrivateRemote* mediaPlayerPrivateRemote, LayerHostingContextID contextId)
+PlatformLayerContainer createVideoLayerRemote(MediaPlayerPrivateRemote*, LayerHostingContextID, WebCore::MediaPlayerEnums::VideoGravity)
 {
     notImplemented();