Changeset 288053 in webkit

Timestamp:

Jan 14, 2022 11:30:01 PM (6 months ago)

Author:

Peng Liu

Message:

Unable to playback portrait videos on HTML canvas elements
​https://bugs.webkit.org/show_bug.cgi?id=235238

Reviewed by Jer Noble.

We need to make sure the destination pixel buffer is IOSurface-backed.
Otherwise, VTImageRotationSession cannot rotate a pixel buffer with
a compressed pixel format.

Manually tested.

Layout tests for this exist, but unless they run on an iPhone 12 or
later HW, they won't fail. For example:

• media/video-orientation-canvas.html

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

(WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastPixelBuffer):

• platform/graphics/cv/ImageRotationSessionVT.mm:

(WebCore::ImageRotationSessionVT::rotate):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)
• platform/graphics/cv/ImageRotationSessionVT.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-14  Peng Liu  <peng.liu6@apple.com>
+
+        Unable to playback portrait videos on HTML canvas elements
+        https://bugs.webkit.org/show_bug.cgi?id=235238
+
+        Reviewed by Jer Noble.
+
+        We need to make sure the destination pixel buffer is IOSurface-backed.
+        Otherwise, VTImageRotationSession cannot rotate a pixel buffer with
+        a compressed pixel format.
+
+        Manually tested.
+
+        Layout tests for this exist, but unless they run on an iPhone 12 or
+        later HW, they won't fail. For example:
+        - media/video-orientation-canvas.html
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::updateLastPixelBuffer):
+        * platform/graphics/cv/ImageRotationSessionVT.mm:
+        (WebCore::ImageRotationSessionVT::rotate):
+
 2022-01-14  Frederic Wang  <fwang@igalia.com>
 

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

@@ -2557 +2557 @@
     }
 
-    if (m_imageRotationSession)
+    if (m_lastPixelBuffer && m_imageRotationSession)
         m_lastPixelBuffer = m_imageRotationSession->rotate(m_lastPixelBuffer.get());
 

trunk/Source/WebCore/platform/graphics/cv/ImageRotationSessionVT.mm

@@ -103 +103 @@
             (__bridge NSString *)kCVPixelBufferPixelFormatTypeKey: @(m_pixelFormat),
             (__bridge NSString *)kCVPixelBufferCGImageCompatibilityKey: (m_isCGImageCompatible == IsCGImageCompatible::Yes ? @YES : @NO),
-#if PLATFORM(IOS_SIMULATOR) || PLATFORM(MAC)
             (__bridge NSString *)kCVPixelBufferIOSurfacePropertiesKey : @{ }
-#endif
         };
 
@@ -120 +118 @@
     CVPixelBufferRef rawRotatedBuffer = nullptr;
     auto status = CVPixelBufferPoolCreatePixelBuffer(kCFAllocatorDefault, m_rotationPool.get(), &rawRotatedBuffer);
-    if (status != kCVReturnSuccess) {
+    if (status != kCVReturnSuccess || !rawRotatedBuffer) {
         RELEASE_LOG_ERROR(WebRTC, "ImageRotationSessionVT failed creating buffer from pool with error %d", status);
         return nullptr;