Changeset 269900 in webkit


Ignore:
Timestamp:
Nov 17, 2020 7:31:47 AM (3 years ago)
Author:
commit-queue@webkit.org
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 <​kkinnunen@apple.com> 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:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r269897 r269900  
     12020-11-17  Kimmo Kinnunen  <kkinnunen@apple.com>
     2
     3        Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
     4        https://bugs.webkit.org/show_bug.cgi?id=219030
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Fix compile for simulator builds.
     9        Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
     10        HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.
     11
     12        * wtf/PlatformHave.h:
     13
    1142020-11-17  Antoine Quint  <graouts@webkit.org>
    215

  • trunk/Source/WTF/wtf/PlatformHave.h

    r269898 r269900  
    776776#endif
    777777
    778 #if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
    779 #define HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES 1
    780 #endif
     778#if (PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
     779#define HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES 1
     780#endif

  • trunk/Source/WebCore/ChangeLog

    r269899 r269900  
     12020-11-17  Kimmo Kinnunen  <kkinnunen@apple.com>
     2
     3        Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
     4        https://bugs.webkit.org/show_bug.cgi?id=219030
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Fix compile for simulator builds.
     9        Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
     10        HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.
     11
     12        * platform/graphics/cv/GraphicsContextGLCVANGLE.cpp:
     13        (WebCore::pixelRangeFromPixelFormat):
     14        (WebCore::GraphicsContextGLCVANGLE::copyPixelBufferToTexture):
     15
    1162020-11-17  Claudio Saavedra  <csaavedra@igalia.com>
    217

  • trunk/Source/WebCore/PAL/ChangeLog

    r269898 r269900  
     12020-11-17  Kimmo Kinnunen  <kkinnunen@apple.com>
     2
     3        Build fails on internal simulator builds due to missing enum kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
     4        https://bugs.webkit.org/show_bug.cgi?id=219030
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Fix compile for simulator builds.
     9        Rename HAVE_CV_AGX_420_PIXEL_FORMAT_TYPES to
     10        HAVE_COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES to better reflect what the ifdef does.
     11
     12        * pal/spi/cf/CoreVideoSPI.h:
     13
    1142020-11-17  Kimmo Kinnunen  <kkinnunen@apple.com>
    215

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

    r269898 r269900  
    3232#else
    3333
    34 #if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
     34#if HAVE(COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES)
    3535enum {
    3636    kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange = '&8v0',

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

    r269898 r269900  
    148148    case kCVPixelFormatType_422YpCbCr10BiPlanarVideoRange:
    149149    case kCVPixelFormatType_444YpCbCr10BiPlanarVideoRange:
    150 #if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
     150#if HAVE(COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES)
    151151    case kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange:
    152152#endif
    … …  
    159159    case kCVPixelFormatType_422YpCbCr10BiPlanarFullRange:
    160160    case kCVPixelFormatType_444YpCbCr10BiPlanarFullRange:
    161 #if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
     161#if HAVE(COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES)
    162162    case kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange:
    163163#endif
    … …  
    588588    if (pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
    589589        && pixelFormat != kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
    590 #if HAVE(CV_AGX_420_PIXEL_FORMAT_TYPES)
     590#if HAVE(COREVIDEO_COMPRESSED_PIXEL_FORMAT_TYPES)
    591591        && pixelFormat != kCVPixelFormatType_AGX_420YpCbCr8BiPlanarVideoRange
    592592        && pixelFormat != kCVPixelFormatType_AGX_420YpCbCr8BiPlanarFullRange
Note: See TracChangeset for help on using the changeset viewer.