Title: [270914] branches/safari-610-branch/Source
Revision
270914
Author
[email protected]
Date
2020-12-16 16:11:07 -0800 (Wed, 16 Dec 2020)

Log Message

Cherry-pick r269900. rdar://problem/72298580

    Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
    https://bugs.webkit.org/show_bug.cgi?id=219030

    Patch by Kimmo Kinnunen <[email protected]> on 2020-11-17
    Reviewed by Antti Koivisto.

    Fix compile for simulator builds.
    Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
    HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.

    Source/WebCore:

    * platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:
    (WebCore::pixelRangeFromPixelFormat):
    (WebCore::GraphicsContextGLCVANGLE::copyPixelBufferToTexture):

    Source/WebCore/PAL:

    * pal/spi/cf/CoreVideoSPI.h:

    Source/WTF:

    * wtf/PlatformHave.h:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269900 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610-branch/Source/WTF/ChangeLog (270913 => 270914)


--- branches/safari-610-branch/Source/WTF/ChangeLog	2020-12-17 00:10:47 UTC (rev 270913)
+++ branches/safari-610-branch/Source/WTF/ChangeLog	2020-12-17 00:11:07 UTC (rev 270914)
@@ -1,3 +1,46 @@
+2020-12-16  Alan Coon  <[email protected]>
+
+        Cherry-pick r269900. rdar://problem/72298580
+
+    Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
+    https://bugs.webkit.org/show_bug.cgi?id=219030
+    
+    Patch by Kimmo Kinnunen <[email protected]> on 2020-11-17
+    Reviewed by Antti Koivisto.
+    
+    Fix compile for simulator builds.
+    Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
+    HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.
+    
+    Source/WebCore:
+    
+    * platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:
+    (WebCore::pixelRangeFromPixelFormat):
+    (WebCore::GraphicsContextGLCVANGLE::copyPixelBufferToTexture):
+    
+    Source/WebCore/PAL:
+    
+    * pal/spi/cf/CoreVideoSPI.h:
+    
+    Source/WTF:
+    
+    * wtf/PlatformHave.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269900 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-11-17  Kimmo Kinnunen  <[email protected]>
+
+            Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
+            https://bugs.webkit.org/show_bug.cgi?id=219030
+
+            Reviewed by Antti Koivisto.
+
+            Fix compile for simulator builds.
+            Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
+            HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.
+
+            * wtf/PlatformHave.h:
+
 2020-12-15  Alan Coon  <[email protected]>
 
         Cherry-pick r270321. rdar://problem/72298523

Modified: branches/safari-610-branch/Source/WTF/wtf/PlatformHave.h (270913 => 270914)


--- branches/safari-610-branch/Source/WTF/wtf/PlatformHave.h	2020-12-17 00:10:47 UTC (rev 270913)
+++ branches/safari-610-branch/Source/WTF/wtf/PlatformHave.h	2020-12-17 00:11:07 UTC (rev 270914)
@@ -718,6 +718,6 @@
 #define HAVE_LIBXSLT_FIX_FOR_RADAR_71864140 1
 #endif
 
-#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
-#define HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES 1
+#if (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+#define HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES 1
 #endif

Modified: branches/safari-610-branch/Source/WebCore/ChangeLog (270913 => 270914)


--- branches/safari-610-branch/Source/WebCore/ChangeLog	2020-12-17 00:10:47 UTC (rev 270913)
+++ branches/safari-610-branch/Source/WebCore/ChangeLog	2020-12-17 00:11:07 UTC (rev 270914)
@@ -1,3 +1,48 @@
+2020-12-16  Alan Coon  <[email protected]>
+
+        Cherry-pick r269900. rdar://problem/72298580
+
+    Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
+    https://bugs.webkit.org/show_bug.cgi?id=219030
+    
+    Patch by Kimmo Kinnunen <[email protected]> on 2020-11-17
+    Reviewed by Antti Koivisto.
+    
+    Fix compile for simulator builds.
+    Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
+    HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.
+    
+    Source/WebCore:
+    
+    * platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:
+    (WebCore::pixelRangeFromPixelFormat):
+    (WebCore::GraphicsContextGLCVANGLE::copyPixelBufferToTexture):
+    
+    Source/WebCore/PAL:
+    
+    * pal/spi/cf/CoreVideoSPI.h:
+    
+    Source/WTF:
+    
+    * wtf/PlatformHave.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269900 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-11-17  Kimmo Kinnunen  <[email protected]>
+
+            Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
+            https://bugs.webkit.org/show_bug.cgi?id=219030
+
+            Reviewed by Antti Koivisto.
+
+            Fix compile for simulator builds.
+            Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
+            HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.
+
+            * platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:
+            (WebCore::pixelRangeFromPixelFormat):
+            (WebCore::GraphicsContextGLCVANGLE::copyPixelBufferToTexture):
+
 2020-12-15  Alan Coon  <[email protected]>
 
         Cherry-pick r266695. rdar://problem/72356057

Modified: branches/safari-610-branch/Source/WebCore/PAL/ChangeLog (270913 => 270914)


--- branches/safari-610-branch/Source/WebCore/PAL/ChangeLog	2020-12-17 00:10:47 UTC (rev 270913)
+++ branches/safari-610-branch/Source/WebCore/PAL/ChangeLog	2020-12-17 00:11:07 UTC (rev 270914)
@@ -1,5 +1,48 @@
 2020-12-16  Alan Coon  <[email protected]>
 
+        Cherry-pick r269900. rdar://problem/72298580
+
+    Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
+    https://bugs.webkit.org/show_bug.cgi?id=219030
+    
+    Patch by Kimmo Kinnunen <[email protected]> on 2020-11-17
+    Reviewed by Antti Koivisto.
+    
+    Fix compile for simulator builds.
+    Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
+    HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.
+    
+    Source/WebCore:
+    
+    * platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:
+    (WebCore::pixelRangeFromPixelFormat):
+    (WebCore::GraphicsContextGLCVANGLE::copyPixelBufferToTexture):
+    
+    Source/WebCore/PAL:
+    
+    * pal/spi/cf/CoreVideoSPI.h:
+    
+    Source/WTF:
+    
+    * wtf/PlatformHave.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269900 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-11-17  Kimmo Kinnunen  <[email protected]>
+
+            Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
+            https://bugs.webkit.org/show_bug.cgi?id=219030
+
+            Reviewed by Antti Koivisto.
+
+            Fix compile for simulator builds.
+            Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
+            HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.
+
+            * pal/spi/cf/CoreVideoSPI.h:
+
+2020-12-16  Alan Coon  <[email protected]>
+
         Cherry-pick r269898. rdar://problem/72298580
 
     Build fails on internal Catalina due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange

Modified: branches/safari-610-branch/Source/WebCore/PAL/pal/spi/cf/CoreVideoSPI.h (270913 => 270914)


--- branches/safari-610-branch/Source/WebCore/PAL/pal/spi/cf/CoreVideoSPI.h	2020-12-17 00:10:47 UTC (rev 270913)
+++ branches/safari-610-branch/Source/WebCore/PAL/pal/spi/cf/CoreVideoSPI.h	2020-12-17 00:11:07 UTC (rev 270914)
@@ -31,7 +31,7 @@
 #include <CoreVideo/CVPixelBufferPrivate.h>
 #else
 
-#if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
+#if HAVE(COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES)
 enum {
     kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange = '&8v0',
     kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange = '&8f0',

Modified: branches/safari-610-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp (270913 => 270914)


--- branches/safari-610-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp	2020-12-17 00:10:47 UTC (rev 270913)
+++ branches/safari-610-branch/Source/WebCore/platform/graphics/cv/VideoTextureCopierCV.cpp	2020-12-17 00:11:07 UTC (rev 270914)
@@ -199,7 +199,7 @@
     case kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange:
     case kCVPixelFormatType_422YpCbCr10BiPlanarVideoRange:
     case kCVPixelFormatType_444YpCbCr10BiPlanarVideoRange:
-#if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
+#if HAVE(COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES)
     case kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange:
 #endif
         return PixelRange::Video;
@@ -210,7 +210,7 @@
     case kCVPixelFormatType_420YpCbCr10BiPlanarFullRange:
     case kCVPixelFormatType_422YpCbCr10BiPlanarFullRange:
     case kCVPixelFormatType_444YpCbCr10BiPlanarFullRange:
-#if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
+#if HAVE(COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES)
     case kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange:
 #endif
         return PixelRange::Full;
@@ -820,7 +820,7 @@
     OSType pixelFormat = CVPixelBufferGetPixelFormatType(image);
     if (pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
         && pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
-#if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
+#if HAVE(COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES)
         && pixelFormat != kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
         && pixelFormat != kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to