Changeset 263707 in webkit

Timestamp:

Jun 29, 2020 4:32:18 PM (4 years ago)

Author:

Peng Liu

Message:

Video spills over PiP screen a little when using Picture in Picture
​https://bugs.webkit.org/show_bug.cgi?id=213658

Reviewed by Eric Carlson.

Source/WebCore:

We need to provide video content dimensions instead of video element sizes to
AVPlayerController to make sure that the Picture-in-Picture window will have
the correct aspect ratio.

Test: media/picture-in-picture/picture-in-picture-window-aspect-ratio.html

• platform/ios/VideoFullscreenInterfaceAVKit.h:
• platform/ios/VideoFullscreenInterfaceAVKit.mm:

(VideoFullscreenInterfaceAVKit::setupFullscreen):

• platform/ios/WebVideoFullscreenControllerAVKit.mm:

(VideoFullscreenControllerContext::setUpFullscreen):

Source/WebKit:

Add the video content dimensions to the IPC message VideoFullscreenManagerProxy::SetupFullscreenWithID.

• UIProcess/Cocoa/VideoFullscreenManagerProxy.h:
• UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in:
• UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:

(WebKit::VideoFullscreenManagerProxy::setupFullscreenWithID):
(WebKit::VideoFullscreenManagerProxy::setVideoDimensions):
(WebKit::VideoFullscreenManagerProxy::enterFullscreen):

• WebProcess/cocoa/VideoFullscreenManager.mm:

(WebKit::VideoFullscreenManager::enterVideoFullscreenForVideoElement):

LayoutTests:

• media/picture-in-picture/picture-in-picture-window-aspect-ratio-expected.txt: Added.
• media/picture-in-picture/picture-in-picture-window-aspect-ratio.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/picture-in-picture/picture-in-picture-window-aspect-ratio-expected.txt (added)
• LayoutTests/media/picture-in-picture/picture-in-picture-window-aspect-ratio.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.h (modified) (1 diff)
• Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (modified) (2 diffs)
• Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h (modified) (3 diffs)
• Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (modified) (5 diffs)
• Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-06-29  Peng Liu  <peng.liu6@apple.com>
+
+        Video spills over PiP screen a little when using Picture in Picture
+        https://bugs.webkit.org/show_bug.cgi?id=213658
+
+        Reviewed by Eric Carlson.
+
+        * media/picture-in-picture/picture-in-picture-window-aspect-ratio-expected.txt: Added.
+        * media/picture-in-picture/picture-in-picture-window-aspect-ratio.html: Added.
+
 2020-06-29  Karl Rackler  <rackler@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-06-29  Peng Liu  <peng.liu6@apple.com>
+
+        Video spills over PiP screen a little when using Picture in Picture
+        https://bugs.webkit.org/show_bug.cgi?id=213658
+
+        Reviewed by Eric Carlson.
+
+        We need to provide video content dimensions instead of video element sizes to
+        AVPlayerController to make sure that the Picture-in-Picture window will have
+        the correct aspect ratio.
+
+        Test: media/picture-in-picture/picture-in-picture-window-aspect-ratio.html
+
+        * platform/ios/VideoFullscreenInterfaceAVKit.h:
+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+        (VideoFullscreenInterfaceAVKit::setupFullscreen):
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        (VideoFullscreenControllerContext::setUpFullscreen):
+
 2020-06-29  Tetsuharu Ohzeki  <tetsuharu.ohzeki@gmail.com>
 

trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.h

@@ -80 +80 @@
     WEBCORE_EXPORT void externalPlaybackChanged(bool enabled, PlaybackSessionModel::ExternalPlaybackTargetType, const String& localizedDeviceName) final;
 
-    WEBCORE_EXPORT void setupFullscreen(UIView&, const IntRect& initialRect, UIView *, HTMLMediaElementEnums::VideoFullscreenMode, bool allowsPictureInPicturePlayback, bool standby);
+    WEBCORE_EXPORT void setupFullscreen(UIView& videoView, const IntRect& initialRect, const FloatSize& videoDimensions, UIView* parentView, HTMLMediaElementEnums::VideoFullscreenMode, bool allowsPictureInPicturePlayback, bool standby);
     WEBCORE_EXPORT void enterFullscreen();
     WEBCORE_EXPORT void exitFullscreen(const IntRect& finalRect);

trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm

@@ -890 +890 @@
 }
 
-void VideoFullscreenInterfaceAVKit::setupFullscreen(UIView& videoView, const IntRect& initialRect, UIView* parentView, HTMLMediaElementEnums::VideoFullscreenMode mode, bool allowsPictureInPicturePlayback, bool standby)
+void VideoFullscreenInterfaceAVKit::setupFullscreen(UIView& videoView, const IntRect& initialRect, const FloatSize& videoDimensions, UIView* parentView, HTMLMediaElementEnums::VideoFullscreenMode mode, bool allowsPictureInPicturePlayback, bool standby)
 {
     ASSERT(standby || mode != HTMLMediaElementEnums::VideoFullscreenModeNone);
@@ -897 +897 @@
     [playerController() setHasEnabledVideo:true];
     [playerController() setHasVideo:true];
-    [playerController() setContentDimensions:initialRect.size()];
+    [playerController() setContentDimensions:videoDimensions];
 
     m_allowsPictureInPicturePlayback = allowsPictureInPicturePlayback;

trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm

@@ -982 +982 @@
     m_fullscreenModel->setVideoLayerFrame(videoLayerFrame);
 
-    dispatch_async(dispatch_get_main_queue(), [protectedThis = makeRefPtr(this), this, videoElementClientRect, viewRef, mode, allowsPictureInPicture] {
+    FloatSize videoDimensions = { (float)videoElement.videoWidth(), (float)videoElement.videoHeight() };
+
+    dispatch_async(dispatch_get_main_queue(), [protectedThis = makeRefPtr(this), this, videoElementClientRect, videoDimensions, viewRef, mode, allowsPictureInPicture] {
         ASSERT(isUIThread());
         WebThreadLock();
@@ -994 +996 @@
         m_videoFullscreenView = adoptNS([PAL::allocUIViewInstance() init]);
 
-        m_interface->setupFullscreen(*m_videoFullscreenView.get(), videoElementClientRect, viewRef.get(), mode, allowsPictureInPicture, false);
+        m_interface->setupFullscreen(*m_videoFullscreenView.get(), videoElementClientRect, videoDimensions, viewRef.get(), mode, allowsPictureInPicture, false);
     });
 }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-29  Peng Liu  <peng.liu6@apple.com>
+
+        Video spills over PiP screen a little when using Picture in Picture
+        https://bugs.webkit.org/show_bug.cgi?id=213658
+
+        Reviewed by Eric Carlson.
+
+        Add the video content dimensions to the IPC message VideoFullscreenManagerProxy::SetupFullscreenWithID.
+
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.h:
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in:
+        * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+        (WebKit::VideoFullscreenManagerProxy::setupFullscreenWithID):
+        (WebKit::VideoFullscreenManagerProxy::setVideoDimensions):
+        (WebKit::VideoFullscreenManagerProxy::enterFullscreen):
+        * WebProcess/cocoa/VideoFullscreenManager.mm:
+        (WebKit::VideoFullscreenManager::enterVideoFullscreenForVideoElement):
+
 2020-06-29  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h

@@ -56 +56 @@
 namespace WebKit {
 
+constexpr size_t DefaultMockPictureInPictureWindowWidth = 100;
+constexpr size_t DefaultMockPictureInPictureWindowHeight = 100;
+
 class WebPageProxy;
 class PlaybackSessionManagerProxy;
@@ -161 +164 @@
 
     // Messages from VideoFullscreenManager
-    void setupFullscreenWithID(PlaybackSessionContextIdentifier, WebKit::LayerHostingContextID videoLayerID, const WebCore::IntRect& initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool allowsPictureInPicture, bool standby);
+    void setupFullscreenWithID(PlaybackSessionContextIdentifier, WebKit::LayerHostingContextID videoLayerID, const WebCore::IntRect& initialRect, const WebCore::FloatSize& videoDimensions, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool allowsPictureInPicture, bool standby);
     void setInlineRect(PlaybackSessionContextIdentifier, const WebCore::IntRect& inlineRect, bool visible);
     void setHasVideoContentLayer(PlaybackSessionContextIdentifier, bool value);
@@ -189 +192 @@
 
     bool m_mockVideoPresentationModeEnabled { false };
+    WebCore::FloatSize m_mockPictureInPictureWindowSize { DefaultMockPictureInPictureWindowWidth, DefaultMockPictureInPictureWindowHeight };
 
     WebPageProxy* m_page;

trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.messages.in

@@ -25 +25 @@
     SetHasVideo(WebKit::PlaybackSessionContextIdentifier contextId, bool hasVideo)
     SetVideoDimensions(WebKit::PlaybackSessionContextIdentifier contextId, WebCore::FloatSize videoDimensions)
-    SetupFullscreenWithID(WebKit::PlaybackSessionContextIdentifier contextId, WebKit::LayerHostingContextID videoLayerID, WebCore::IntRect initialRect, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby)
+    SetupFullscreenWithID(WebKit::PlaybackSessionContextIdentifier contextId, WebKit::LayerHostingContextID videoLayerID, WebCore::IntRect initialRect, WebCore::FloatSize videoDimensions, float hostingScaleFactor, WebCore::HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby)
     EnterFullscreen(WebKit::PlaybackSessionContextIdentifier contextId)
     ExitFullscreen(WebKit::PlaybackSessionContextIdentifier contextId, WebCore::IntRect finalRect)

trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm

@@ -507 +507 @@
 #pragma mark Messages from VideoFullscreenManager
 
-void VideoFullscreenManagerProxy::setupFullscreenWithID(PlaybackSessionContextIdentifier contextId, WebKit::LayerHostingContextID videoLayerID, const WebCore::IntRect& initialRect, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby)
+void VideoFullscreenManagerProxy::setupFullscreenWithID(PlaybackSessionContextIdentifier contextId, WebKit::LayerHostingContextID videoLayerID, const WebCore::IntRect& initialRect, const WebCore::FloatSize& videoDimensions, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby)
 {
     MESSAGE_CHECK(videoLayerID);
@@ -515 +515 @@
 
     if (m_mockVideoPresentationModeEnabled) {
+        if (!videoDimensions.isEmpty())
+            m_mockPictureInPictureWindowSize.setHeight(DefaultMockPictureInPictureWindowWidth /  videoDimensions.aspectRatio());
 #if PLATFORM(IOS_FAMILY)
         requestVideoContentLayer(contextId);
@@ -541 +543 @@
     auto* rootNode = downcast<RemoteLayerTreeDrawingAreaProxy>(*m_page->drawingArea()).remoteLayerTreeHost().rootNode();
     UIView *parentView = rootNode ? rootNode->uiView() : nil;
-    interface->setupFullscreen(*model->layerHostView(), initialRect, parentView, videoFullscreenMode, allowsPictureInPicture, standby);
-#else
+    interface->setupFullscreen(*model->layerHostView(), initialRect, videoDimensions, parentView, videoFullscreenMode, allowsPictureInPicture, standby);
+#else
+    UNUSED_PARAM(videoDimensions);
     IntRect initialWindowRect;
     m_page->rootViewToWindow(initialRect, initialWindowRect);
@@ -560 +563 @@
 void VideoFullscreenManagerProxy::setVideoDimensions(PlaybackSessionContextIdentifier contextId, const FloatSize& videoDimensions)
 {
-    if (m_mockVideoPresentationModeEnabled)
-        return;
-
-    if (auto* interface = findInterface(contextId))
-        interface->videoDimensionsChanged(videoDimensions);
+    auto* interface = findInterface(contextId);
+    if (!interface)
+        return;
+
+    if (m_mockVideoPresentationModeEnabled) {
+        if (videoDimensions.isEmpty())
+            return;
+
+        m_mockPictureInPictureWindowSize.setHeight(DefaultMockPictureInPictureWindowWidth / videoDimensions.aspectRatio());
+        return;
+    }
+
+    interface->videoDimensionsChanged(videoDimensions);
 }
 
@@ -571 +582 @@
     if (m_mockVideoPresentationModeEnabled) {
         didEnterFullscreen(contextId);
-        setVideoLayerFrame(contextId, {0, 0, 200, 150});
+        setVideoLayerFrame(contextId, {0, 0, m_mockPictureInPictureWindowSize.width(), m_mockPictureInPictureWindowSize.height()});
         return;
     }

trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm

@@ -286 +286 @@
     }
 
-    m_page->send(Messages::VideoFullscreenManagerProxy::SetupFullscreenWithID(contextId, interface->layerHostingContext()->contextID(), videoRect, m_page->deviceScaleFactor(), interface->fullscreenMode(), allowsPictureInPicture, standby));
+    m_page->send(Messages::VideoFullscreenManagerProxy::SetupFullscreenWithID(contextId, interface->layerHostingContext()->contextID(), videoRect, FloatSize(videoElement.videoWidth(), videoElement.videoHeight()), m_page->deviceScaleFactor(), interface->fullscreenMode(), allowsPictureInPicture, standby));
 }