Changeset 269898 in webkit

Timestamp:

Nov 17, 2020 6:07:00 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Build fails on internal Catalina due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
​https://bugs.webkit.org/show_bug.cgi?id=219026

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2020-11-17
Reviewed by Antti Koivisto.

Fix compile for macOS versions before Big Sur.

On macOS, only use the private header on Big Sur. On Catalina, use the
manual enums.

Regressed in:
Textures Fail to Render in WebGL from HLS Stream on iPhone 12 [iOS 14.2]

• pal/spi/cf/CoreVideoSPI.h:

Location:

trunk/Source

Files:

• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cf/CoreVideoSPI.h (modified) (2 diffs)
• WebCore/platform/graphics/cv/GraphicsContextGLCVANGLE.cpp (modified) (3 diffs)

trunk/Source/WTF/wtf/PlatformHave.h

@@ -775 +775 @@
 #define HAVE_SANDBOX_MESSAGE_FILTERING 1
 #endif
+
+#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#define HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES 1
+#endif

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2020-11-17  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        Build fails on internal Catalina due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
+        https://bugs.webkit.org/show_bug.cgi?id=219026
+
+        Reviewed by Antti Koivisto.
+
+        Fix compile for macOS versions before Big Sur.
+
+        On macOS, only use the private header on Big Sur. On Catalina, use the
+        manual enums.
+
+        Regressed in:
+        Textures Fail to Render in WebGL from HLS Stream on iPhone 12 [iOS 14.2]
+
+        * pal/spi/cf/CoreVideoSPI.h:
+
 2020-11-16  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cf/CoreVideoSPI.h

@@ -31 +31 @@
 #include <CoreVideo/CVPixelBufferPrivate.h>
 #else
+
+#if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
 enum {
     kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange = '&8v0',
@@ -36 +38 @@
 };
 #endif
+
+#endif

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

@@ -148 +148 @@
     case kCVPixelFormatType_422YpCbCr10BiPlanarVideoRange:
     case kCVPixelFormatType_444YpCbCr10BiPlanarVideoRange:
+#if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
     case kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange:
+#endif
         return PixelRange::Video;
     case kCVPixelFormatType_420YpCbCr8PlanarFullRange:
@@ -157 +159 @@
     case kCVPixelFormatType_422YpCbCr10BiPlanarFullRange:
     case kCVPixelFormatType_444YpCbCr10BiPlanarFullRange:
+#if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
     case kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange:
+#endif
         return PixelRange::Full;
     default:
@@ -584 +588 @@
     if (pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
         && pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
+#if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
         && pixelFormat != kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
-        && pixelFormat != kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange) {
+        && pixelFormat != kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange
+#endif
+        ) {
         LOG(WebGL, "GraphicsContextGLCVANGLE::copyVideoTextureToPlatformTexture(%p) - Asked to copy an unsupported pixel format ('%s').", this, FourCC(pixelFormat).toString().utf8().data());
         return false;