Title: [197807] trunk/Source/WebCore
- Revision
- 197807
- Author
- [email protected]
- Date
- 2016-03-08 15:16:29 -0800 (Tue, 08 Mar 2016)
Log Message
Enable API related to the video fullscreen layer in MediaPlayerPrivateMediaStreamAVFObjC for Mac.
https://bugs.webkit.org/show_bug.cgi?id=153239
Reviewed by Eric Carlson.
Reuse VideoFullscreenLayerManager to manage moving the video layer between the fullscreen
layer and the inline layer depending on the current presentation mode.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC):
Create m_videoFullscreenLayerManager.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer):
Return the video inline layer from the VideoFullscreenLayerManager.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::createPreviewLayers):
Call VideoFullscreenLayerManager::setVideoLayer() with the m_videoBackgroundLayer. To make sure
the preview layer (a sublayer of m_videoBackgroundLayer) resize according to aspect ratio, set
its contents gravity to kCAGravityResizeAspect. Also, set its autoresizing mask so it'll resize
with its superlayer.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer):
Call VideoFullscreenLayerManager::setVideoFullscreenLayer().
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenFrame):
Call VideoFullscreenLayerManager::setVideoFullscreenFrame().
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (197806 => 197807)
--- trunk/Source/WebCore/ChangeLog 2016-03-08 23:02:55 UTC (rev 197806)
+++ trunk/Source/WebCore/ChangeLog 2016-03-08 23:16:29 UTC (rev 197807)
@@ -1,3 +1,29 @@
+2016-03-08 Ada Chan <[email protected]>
+
+ Enable API related to the video fullscreen layer in MediaPlayerPrivateMediaStreamAVFObjC for Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=153239
+
+ Reviewed by Eric Carlson.
+
+ Reuse VideoFullscreenLayerManager to manage moving the video layer between the fullscreen
+ layer and the inline layer depending on the current presentation mode.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC):
+ Create m_videoFullscreenLayerManager.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer):
+ Return the video inline layer from the VideoFullscreenLayerManager.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::createPreviewLayers):
+ Call VideoFullscreenLayerManager::setVideoLayer() with the m_videoBackgroundLayer. To make sure
+ the preview layer (a sublayer of m_videoBackgroundLayer) resize according to aspect ratio, set
+ its contents gravity to kCAGravityResizeAspect. Also, set its autoresizing mask so it'll resize
+ with its superlayer.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer):
+ Call VideoFullscreenLayerManager::setVideoFullscreenLayer().
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenFrame):
+ Call VideoFullscreenLayerManager::setVideoFullscreenFrame().
+
2016-03-08 Myles C. Maxfield <[email protected]>
[Font Loading] Crash when a single load request causes multiple fonts to fail loading
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (197806 => 197807)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-03-08 23:02:55 UTC (rev 197806)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h 2016-03-08 23:16:29 UTC (rev 197807)
@@ -46,6 +46,10 @@
class MediaSourcePrivateClient;
class VideoTrackPrivateMediaStream;
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+class VideoFullscreenLayerManager;
+#endif
+
class MediaPlayerPrivateMediaStreamAVFObjC : public MediaPlayerPrivateInterface, public MediaStreamPrivate::Observer {
public:
explicit MediaPlayerPrivateMediaStreamAVFObjC(MediaPlayer*);
@@ -155,6 +159,11 @@
void didAddTrack(MediaStreamTrackPrivate&) override;
void didRemoveTrack(MediaStreamTrackPrivate&) override;
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ void setVideoFullscreenLayer(PlatformLayer*) override;
+ void setVideoFullscreenFrame(FloatRect) override;
+#endif
+
MediaPlayer* m_player { nullptr };
WeakPtrFactory<MediaPlayerPrivateMediaStreamAVFObjC> m_weakPtrFactory;
RefPtr<MediaStreamPrivate> m_mediaStreamPrivate;
@@ -175,6 +184,10 @@
bool m_muted { false };
bool m_haveEverPlayed { false };
bool m_ended { false };
+
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ std::unique_ptr<VideoFullscreenLayerManager> m_videoFullscreenLayerManager;
+#endif
};
}
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (197806 => 197807)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-03-08 23:02:55 UTC (rev 197806)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2016-03-08 23:16:29 UTC (rev 197807)
@@ -42,6 +42,10 @@
#import <wtf/MainThread.h>
#import <wtf/NeverDestroyed.h>
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+#import "VideoFullscreenLayerManager.h"
+#endif
+
#pragma mark - Soft Linking
#import "CoreMediaSoftLink.h"
@@ -57,6 +61,9 @@
: m_player(player)
, m_weakPtrFactory(this)
, m_clock(Clock::create())
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ , m_videoFullscreenLayerManager(VideoFullscreenLayerManager::create())
+#endif
{
LOG(Media, "MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC(%p)", this);
}
@@ -153,7 +160,11 @@
if (!m_videoBackgroundLayer || m_displayMode == None)
return nullptr;
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ return m_videoFullscreenLayerManager->videoInlineLayer();
+#else
return m_videoBackgroundLayer.get();
+#endif
}
MediaPlayerPrivateMediaStreamAVFObjC::DisplayMode MediaPlayerPrivateMediaStreamAVFObjC::currentDisplayMode() const
@@ -391,17 +402,25 @@
if (!m_videoBackgroundLayer) {
m_videoBackgroundLayer = adoptNS([[CALayer alloc] init]);
m_videoBackgroundLayer.get().name = @"MediaPlayerPrivateMediaStreamAVFObjC preview background layer";
+
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ m_videoFullscreenLayerManager->setVideoLayer(m_videoBackgroundLayer.get(), snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
+#endif
}
if (!m_previewLayer) {
m_previewLayer = m_mediaStreamPrivate->platformLayer();
if (m_previewLayer) {
- m_previewLayer.get().contentsGravity = kCAGravityResize;
+ m_previewLayer.get().contentsGravity = kCAGravityResizeAspect;
m_previewLayer.get().anchorPoint = CGPointZero;
if (!m_playing)
m_previewLayer.get().hidden = true;
[m_videoBackgroundLayer addSublayer:m_previewLayer.get()];
+#if PLATFORM(MAC)
+ [m_previewLayer setFrame:[m_videoBackgroundLayer bounds]];
+ [m_previewLayer setAutoresizingMask:(kCALayerWidthSizable | kCALayerHeightSizable)];
+#endif
}
}
@@ -454,6 +473,18 @@
updateTracks();
}
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+void MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenLayer(PlatformLayer *videoFullscreenLayer)
+{
+ m_videoFullscreenLayerManager->setVideoFullscreenLayer(videoFullscreenLayer);
+}
+
+void MediaPlayerPrivateMediaStreamAVFObjC::setVideoFullscreenFrame(FloatRect frame)
+{
+ m_videoFullscreenLayerManager->setVideoFullscreenFrame(frame);
+}
+#endif
+
template <typename RefT, typename PassRefT>
void updateTracksOfType(HashMap<String, RefT>& trackMap, RealtimeMediaSource::Type trackType, MediaStreamTrackPrivateVector& currentTracks, RefT (*itemFactory)(MediaStreamTrackPrivate&), MediaPlayer* player, void (MediaPlayer::*removedFunction)(PassRefT), void (MediaPlayer::*addedFunction)(PassRefT), std::function<void(RefT, int)> configureCallback)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
