Changeset 254257 in webkit


Ignore:
Timestamp:
Jan 9, 2020 6:32:12 AM (4 years ago)
Author:
eric.carlson@apple.com
Message:

Don't softlink AVCapture classes on watchOS or tvOS
https://bugs.webkit.org/show_bug.cgi?id=205974
<rdar://problem/45508044>

Reviewed by Jon Lee.

  • pal/cocoa/AVFoundationSoftLink.h:
  • pal/cocoa/AVFoundationSoftLink.mm:
Location:
trunk/Source/WebCore/PAL
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/PAL/ChangeLog

    r254187 r254257  
     12020-01-09  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Don't softlink AVCapture classes on watchOS or tvOS
     4        https://bugs.webkit.org/show_bug.cgi?id=205974
     5        <rdar://problem/45508044>
     6
     7        Reviewed by Jon Lee.
     8
     9        * pal/cocoa/AVFoundationSoftLink.h:
     10        * pal/cocoa/AVFoundationSoftLink.mm:
     11
    1122020-01-07  Said Abou-Hallawa  <sabouhallawa@apple.com>
    213
  • trunk/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h

    r253064 r254257  
    4444SOFT_LINK_CLASS_FOR_HEADER(PAL, AVAssetWriter)
    4545SOFT_LINK_CLASS_FOR_HEADER(PAL, AVAssetWriterInput)
    46 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureConnection)
    47 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDevice)
    48 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDeviceFormat)
    49 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDeviceInput)
    50 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureOutput)
    51 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureSession)
    52 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureVideoDataOutput)
    5346SOFT_LINK_CLASS_FOR_HEADER(PAL, AVContentKeyReportGroup)
    5447SOFT_LINK_CLASS_FOR_HEADER(PAL, AVContentKeyResponse)
    5548SOFT_LINK_CLASS_FOR_HEADER(PAL, AVContentKeySession)
    56 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVFrameRateRange)
    5749SOFT_LINK_CLASS_FOR_HEADER(PAL, AVMediaSelectionGroup)
    5850SOFT_LINK_CLASS_FOR_HEADER(PAL, AVMediaSelectionOption)
     
    8981SOFT_LINK_CLASS_FOR_HEADER(PAL, AVRouteDetector)
    9082SOFT_LINK_CLASS_FOR_HEADER(PAL, AVVideoPerformanceMetrics)
     83#endif
     84
     85#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
     86SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureConnection)
     87SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDevice)
     88SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDeviceFormat)
     89SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDeviceInput)
     90SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureOutput)
     91SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureSession)
     92SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureVideoDataOutput)
     93SOFT_LINK_CLASS_FOR_HEADER(PAL, AVFrameRateRange)
    9194#endif
    9295
  • trunk/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm

    r254141 r254257  
    6868SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAssetWriter, PAL_EXPORT)
    6969SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAssetWriterInput, PAL_EXPORT)
    70 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureConnection, PAL_EXPORT)
    71 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDevice, PAL_EXPORT)
    72 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDeviceFormat, PAL_EXPORT)
    73 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDeviceInput, PAL_EXPORT)
    74 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureOutput, PAL_EXPORT)
    75 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureSession, PAL_EXPORT)
    76 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureVideoDataOutput, PAL_EXPORT)
    77 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVFrameRateRange, PAL_EXPORT)
    7870SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMediaSelectionGroup, PAL_EXPORT)
    7971SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMediaSelectionOption, PAL_EXPORT)
     
    115107SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVRouteDetector, PAL_EXPORT)
    116108SOFT_LINK_CLASS_FOR_SOURCE_OPTIONAL_WITH_EXPORT(PAL, AVFoundation, AVVideoPerformanceMetrics, PAL_EXPORT)
     109#endif
     110
     111#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
     112SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureConnection, PAL_EXPORT)
     113SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDevice, PAL_EXPORT)
     114SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDeviceFormat, PAL_EXPORT)
     115SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDeviceInput, PAL_EXPORT)
     116SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureOutput, PAL_EXPORT)
     117SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureSession, PAL_EXPORT)
     118SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureVideoDataOutput, PAL_EXPORT)
     119SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVFrameRateRange, PAL_EXPORT)
    117120#endif
    118121
Note: See TracChangeset for help on using the changeset viewer.