Changeset 269893 in webkit

Timestamp:

Nov 16, 2020 9:23:24 PM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Textures Fail to Render in WebGL from HLS Stream on iPhone 12 [iOS 14.2]
​https://bugs.webkit.org/show_bug.cgi?id=218637
<rdar://problem/71102126>

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2020-11-16
Reviewed by Eric Carlson.

Patch by Jer Noble.

Treat internal compressed YUV pixel formats
kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange and
kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange as
kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange and
kCVPixelFormatType_420YpCbCr8BiPlanarFullRange when
using the OpenGL shader to convert video IOSurface to a WebGL
texture.

Fixes cases where the decoder outputs the compressed formats.

No new tests, adding more comprehensive test content suite is tracked
in another bug.

Source/WebCore:

• platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:

(WebCore::pixelRangeFromPixelFormat):
(WebCore::GraphicsContextGLCVANGLE::copyPixelBufferToTexture):

Source/WebCore/PAL:

• PAL.xcodeproj/project.pbxproj:
• pal/spi/cf/CoreVideoSPI.h: Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PAL/ChangeLog (modified) (1 diff)
• PAL/PAL.xcodeproj/project.pbxproj (modified) (2 diffs)
• PAL/pal/spi/cf/CoreVideoSPI.h (added)
• platform/graphics/cv/GraphicsContextGLCVANGLE.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-16  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        Textures Fail to Render in WebGL from HLS Stream on iPhone 12 [iOS 14.2]
+        https://bugs.webkit.org/show_bug.cgi?id=218637
+        <rdar://problem/71102126>
+
+        Reviewed by Eric Carlson.
+
+        Patch by Jer Noble.
+
+        Treat internal compressed YUV pixel formats
+        kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange and
+        kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange as
+        kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange and
+        kCVPixelFormatType_420YpCbCr8BiPlanarFullRange when
+        using the OpenGL shader to convert video IOSurface to a WebGL
+        texture.
+
+        Fixes cases where the decoder outputs the compressed formats.
+
+        No new tests, adding more comprehensive test content suite is tracked
+        in another bug.
+
+        * platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:
+        (WebCore::pixelRangeFromPixelFormat):
+        (WebCore::GraphicsContextGLCVANGLE::copyPixelBufferToTexture):
+
 2020-11-16  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2020-11-16  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        Textures Fail to Render in WebGL from HLS Stream on iPhone 12 [iOS 14.2]
+        https://bugs.webkit.org/show_bug.cgi?id=218637
+        <rdar://problem/71102126>
+
+        Reviewed by Eric Carlson.
+
+        Patch by Jer Noble.
+
+        Treat internal compressed YUV pixel formats
+        kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange and
+        kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange as
+        kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange and
+        kCVPixelFormatType_420YpCbCr8BiPlanarFullRange when
+        using the OpenGL shader to convert video IOSurface to a WebGL
+        texture.
+
+        Fixes cases where the decoder outputs the compressed formats.
+
+        No new tests, adding more comprehensive test content suite is tracked
+        in another bug.
+
+        * PAL.xcodeproj/project.pbxproj:
+        * pal/spi/cf/CoreVideoSPI.h: Added.
+
 2020-11-11  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj

@@ -382 +382 @@
                 C15CBB3223F34A1200300CC7 /* NSUserDefaultsSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NSUserDefaultsSPI.h; sourceTree = "<group>"; };
                 C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CopyPALHeaders.xcconfig; sourceTree = "<group>"; };
+                CD17B268255F1625008430F9 /* CoreVideoSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreVideoSPI.h; sourceTree = "<group>"; };
                 CD6122CA2559B6AC00FC657A /* OutputContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OutputContext.h; sourceTree = "<group>"; };
                 CD6122CB2559B6AC00FC657A /* OutputContext.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OutputContext.mm; sourceTree = "<group>"; };
@@ -444 +445 @@
                                 0C2DA06B1F33CA8400DBC317 /* CoreAudioSPI.h */,
                                 0C2DA06C1F33CA8400DBC317 /* CoreMediaSPI.h */,
+                                CD17B268255F1625008430F9 /* CoreVideoSPI.h */,
                         );
                         path = cf;

trunk/Source/WebCore/platform/graphics/cv/GraphicsContextGLCVANGLE.cpp

@@ -31 +31 @@
 #include "FourCC.h"
 #include "Logging.h"
+#include <pal/spi/cf/CoreVideoSPI.h>
 #include <pal/spi/cocoa/IOSurfaceSPI.h>
 #include <wtf/NeverDestroyed.h>
@@ -147 +148 @@
     case kCVPixelFormatType_422YpCbCr10BiPlanarVideoRange:
     case kCVPixelFormatType_444YpCbCr10BiPlanarVideoRange:
+    case kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange:
         return PixelRange::Video;
     case kCVPixelFormatType_420YpCbCr8PlanarFullRange:
@@ -155 +157 @@
     case kCVPixelFormatType_422YpCbCr10BiPlanarFullRange:
     case kCVPixelFormatType_444YpCbCr10BiPlanarFullRange:
+    case kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange:
         return PixelRange::Full;
     default:
@@ -579 +582 @@
     // FIXME: This currently only supports '420v' and '420f' pixel formats. Investigate supporting more pixel formats.
     OSType pixelFormat = CVPixelBufferGetPixelFormatType(image);
-    if (pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange && pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange) {
+    if (pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
+        && pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
+        && pixelFormat != kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
+        && pixelFormat != kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange) {
         LOG(WebGL, "GraphicsContextGLCVANGLE::copyVideoTextureToPlatformTexture(%p) - Asked to copy an unsupported pixel format ('%s').", this, FourCC(pixelFormat).toString().utf8().data());
         return false;