Changeset 166268 in webkit

Timestamp:

Mar 25, 2014 4:43:13 PM (10 years ago)

Author:

jer.noble@apple.com

Message:

[iOS] Enable caption support in full screen.
​https://bugs.webkit.org/show_bug.cgi?id=130603

Reviewed by Eric Carlson.

Add TextTrackRepresentation support to MediaPlayerPrivateAVFoundationObjC.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer): Add the m_textTrackRepresenationLayer if present.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::requiresTextTrackRepresentation): True, if a m_videoFullscreenLayer is present.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation): Remove the old, and add the new m_textTrackRepresenationLayer.

Make the text track container a stacking context for painting purposes.

• Modules/mediacontrols/mediaControlsiOS.css:

(video::-webkit-media-text-track-container):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacontrols/mediaControlsiOS.css (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (modified) (2 diffs)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-21  Jer Noble  <jer.noble@apple.com>
+
+        [iOS] Enable caption support in full screen.
+        https://bugs.webkit.org/show_bug.cgi?id=130603
+
+        Reviewed by Eric Carlson.
+
+        Add TextTrackRepresentation support to MediaPlayerPrivateAVFoundationObjC.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer): Add the m_textTrackRepresenationLayer if present.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer): Ditto.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::requiresTextTrackRepresentation): True, if a m_videoFullscreenLayer is present.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation): Remove the old, and add the new m_textTrackRepresenationLayer.
+
+        Make the text track container a stacking context for painting purposes.
+        * Modules/mediacontrols/mediaControlsiOS.css:
+        (video::-webkit-media-text-track-container):
+
 2014-03-25  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css

@@ -296 +296 @@
     overflow: hidden;
     padding-bottom: 5px;
+    z-index: 0;
 
     text-align: center;

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

@@ -191 +191 @@
 
     virtual bool hasSingleSecurityOrigin() const;
-    
+
+#if ENABLE(VIDEO_TRACK)
+    virtual bool requiresTextTrackRepresentation() const override;
+    virtual void setTextTrackRepresentation(TextTrackRepresentation*) override;
+#endif
+
     void createImageGenerator();
     void destroyImageGenerator();
@@ -255 +260 @@
     FloatRect m_videoFullscreenFrame;
     MediaPlayer::VideoGravity m_videoFullscreenGravity;
+    RetainPtr<PlatformLayer> m_textTrackRepresentationLayer;
 #endif
     RetainPtr<WebCoreAVFMovieObserver> m_objcObserver;

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -49 +49 @@
 #import "SecurityOrigin.h"
 #import "SoftLinking.h"
+#import "TextTrackRepresentation.h"
 #import "UUID.h"
 #import "VideoTrackPrivateAVFObjC.h"
@@ -512 +513 @@
         if (m_videoFullscreenLayer) {
             [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
-            [m_videoFullscreenLayer addSublayer:m_videoLayer.get()];
+            [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
         }
 #endif
@@ -800 +801 @@
     m_videoFullscreenLayer = videoFullscreenLayer;
 
-    if (!m_videoFullscreenLayer || !m_videoLayer)
-        return;
-
-    [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
-    [m_videoFullscreenLayer addSublayer:m_videoLayer.get()];
+    CGRect frame = CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height());
+
+    if (m_videoFullscreenLayer && m_videoLayer) {
+        [m_videoLayer setFrame:frame];
+        [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
+    }
+
+    if (m_videoFullscreenLayer && m_textTrackRepresentationLayer) {
+        CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : frame;
+        [m_textTrackRepresentationLayer setFrame:textFrame];
+        [m_videoFullscreenLayer addSublayer:m_textTrackRepresentationLayer.get()];
+    }
 }
 
@@ -810 +818 @@
 {
     m_videoFullscreenFrame = frame;
-    if (!m_videoFullscreenLayer || !m_videoLayer)
-        return;
-    
-    [m_videoLayer setFrame:CGRectMake(0, 0, frame.width(), frame.height())];
+    if (!m_videoFullscreenLayer)
+        return;
+
+    if (m_videoLayer)
+        [m_videoLayer setFrame:CGRectMake(0, 0, frame.width(), frame.height())];
+
+    if (m_textTrackRepresentationLayer) {
+        CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : static_cast<CGRect>(frame);
+        [m_textTrackRepresentationLayer setFrame:textFrame];
+    }
 }
 
@@ -1466 +1480 @@
 {
     determineChangedTracksFromNewTracksAndOldItems(m_cachedTracks.get(), AVMediaTypeVideo, m_videoTracks, &VideoTrackPrivateAVFObjC::create, player(), &MediaPlayer::removeVideoTrack, &MediaPlayer::addVideoTrack);
+}
+
+bool MediaPlayerPrivateAVFoundationObjC::requiresTextTrackRepresentation() const
+{
+#if PLATFORM(IOS)
+    if (m_videoFullscreenLayer)
+        return true;
+#endif
+    return false;
+}
+
+void MediaPlayerPrivateAVFoundationObjC::setTextTrackRepresentation(TextTrackRepresentation* representation)
+{
+#if PLATFORM(IOS)
+    PlatformLayer* representationLayer = representation ? representation->platformLayer() : nil;
+    if (representationLayer == m_textTrackRepresentationLayer)
+        return;
+
+    if (m_textTrackRepresentationLayer)
+        [m_textTrackRepresentationLayer removeFromSuperlayer];
+
+    m_textTrackRepresentationLayer = representationLayer;
+
+    if (m_videoFullscreenLayer && m_textTrackRepresentationLayer) {
+        CGRect textFrame = m_videoLayer ? [m_videoLayer videoRect] : CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height());
+
+        [m_textTrackRepresentationLayer setFrame:textFrame];
+        [m_videoFullscreenLayer addSublayer:m_textTrackRepresentationLayer.get()];
+    }
+
+#else
+    UNUSED_PARAM(representation);
+#endif
 }
 #endif // ENABLE(VIDEO_TRACK)