Title: [269900] trunk/Source
- Revision
- 269900
- Author
- [email protected]
- Date
- 2020-11-17 07:31:47 -0800 (Tue, 17 Nov 2020)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (269899 => 269900)
--- trunk/Source/WTF/ChangeLog 2020-11-17 14:48:07 UTC (rev 269899)
+++ trunk/Source/WTF/ChangeLog 2020-11-17 15:31:47 UTC (rev 269900)
@@ -1,3 +1,16 @@
+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-11-17 Antoine Quint <[email protected]>
Make <model> disabled by default everywhere
Modified: trunk/Source/WTF/wtf/PlatformHave.h (269899 => 269900)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-11-17 14:48:07 UTC (rev 269899)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-11-17 15:31:47 UTC (rev 269900)
@@ -775,6 +775,6 @@
#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
+#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: trunk/Source/WebCore/ChangeLog (269899 => 269900)
--- trunk/Source/WebCore/ChangeLog 2020-11-17 14:48:07 UTC (rev 269899)
+++ trunk/Source/WebCore/ChangeLog 2020-11-17 15:31:47 UTC (rev 269900)
@@ -1,3 +1,18 @@
+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-11-17 Claudio Saavedra <[email protected]>
More non-unified build fixes
Modified: trunk/Source/WebCore/PAL/ChangeLog (269899 => 269900)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-11-17 14:48:07 UTC (rev 269899)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-11-17 15:31:47 UTC (rev 269900)
@@ -1,5 +1,18 @@
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-11-17 Kimmo Kinnunen <[email protected]>
+
Build fails on internal Catalina due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
https://bugs.webkit.org/show_bug.cgi?id=219026
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CoreVideoSPI.h (269899 => 269900)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CoreVideoSPI.h 2020-11-17 14:48:07 UTC (rev 269899)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CoreVideoSPI.h 2020-11-17 15:31:47 UTC (rev 269900)
@@ -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: trunk/Source/WebCore/platform/graphics/cv/GraphicsContextGLCVANGLE.cpp (269899 => 269900)
--- trunk/Source/WebCore/platform/graphics/cv/GraphicsContextGLCVANGLE.cpp 2020-11-17 14:48:07 UTC (rev 269899)
+++ trunk/Source/WebCore/platform/graphics/cv/GraphicsContextGLCVANGLE.cpp 2020-11-17 15:31:47 UTC (rev 269900)
@@ -147,7 +147,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;
@@ -158,7 +158,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;
@@ -587,7 +587,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
