Changeset 264719 in webkit


Ignore:
Timestamp:
Jul 22, 2020 12:27:05 PM (4 years ago)
Author:
jer.noble@apple.com
Message:

Unreviewed build fix after r264710; add a HAVE_AVPLAYER_VIDEORANGEOVERRIDE guard.

Source/WebCore:

  • platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setPreferredDynamicRangeMode):

Source/WebCore/PAL:

  • pal/spi/cocoa/AVFoundationSPI.h:

Source/WebKit:

  • WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::WebProcess::updatePageScreenProperties):

Source/WTF:

  • wtf/PlatformHave.h:
Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r264696 r264719  
     12020-07-22  Jer Noble  <jer.noble@apple.com>
     2
     3        Unreviewed build fix after r264710; add a HAVE_AVPLAYER_VIDEORANGEOVERRIDE guard.
     4
     5        * wtf/PlatformHave.h:
     6
    172020-07-22  Geoffrey Garen  <ggaren@apple.com>
    28

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

    r264663 r264719  
    551551#endif
    552552
     553#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600
     554#define HAVE_AVPLAYER_VIDEORANGEOVERRIDE 1
     555#endif
     556
    553557#if PLATFORM(COCOA) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
    554558#define HAVE_CG_PATH_UNEVEN_CORNERS_ROUNDEDRECT 1

  • trunk/Source/WebCore/ChangeLog

    r264714 r264719  
     12020-07-22  Jer Noble  <jer.noble@apple.com>
     2
     3        Unreviewed build fix after r264710; add a HAVE_AVPLAYER_VIDEORANGEOVERRIDE guard.
     4
     5        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     6        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
     7        (WebCore::MediaPlayerPrivateAVFoundationObjC::setPreferredDynamicRangeMode):
     8
    192020-07-22  Myles C. Maxfield  <mmaxfield@apple.com>
    210

  • trunk/Source/WebCore/PAL/ChangeLog

    r264710 r264719  
     12020-07-22  Jer Noble  <jer.noble@apple.com>
     2
     3        Unreviewed build fix after r264710; add a HAVE_AVPLAYER_VIDEORANGEOVERRIDE guard.
     4
     5        * pal/spi/cocoa/AVFoundationSPI.h:
     6
    172020-07-22  Jer Noble  <jer.noble@apple.com>
    28

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h

    r264710 r264719  
    6565NS_ASSUME_NONNULL_END
    6666
     67#if HAVE(AVPLAYER_VIDEORANGEOVERRIDE)
    6768typedef NSString * AVVideoRange NS_TYPED_ENUM;
    6869@interface AVPlayer (AVPlayerVideoRangeOverride)
    … …  
    7071+ (nullable AVVideoRange)preferredVideoRangeForDisplays:(nonnull NSArray <NSNumber *>*)displays;
    7172@end
     73#endif
    7274
    7375#if ENABLE(WIRELESS_PLAYBACK_TARGET) || PLATFORM(IOS_FAMILY)

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r264710 r264719  
    913913
    914914    m_avPlayer.get().appliesMediaSelectionCriteriaAutomatically = NO;
     915#if HAVE(AVPLAYER_VIDEORANGEOVERRIDE)
    915916    if ([m_avPlayer respondsToSelector:@selector(setVideoRangeOverride:)])
    916917        m_avPlayer.get().videoRangeOverride = convertDynamicRangeModeEnumToAVVideoRange(player()->preferredDynamicRangeMode());
     918#endif
    917919
    918920#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    … …  
    32723274void MediaPlayerPrivateAVFoundationObjC::setPreferredDynamicRangeMode(DynamicRangeMode mode)
    32733275{
     3276#if HAVE(AVPLAYER_VIDEORANGEOVERRIDE)
    32743277    if (m_avPlayer && [m_avPlayer respondsToSelector:@selector(setVideoRangeOverride:)])
    32753278        m_avPlayer.get().videoRangeOverride = convertDynamicRangeModeEnumToAVVideoRange(mode);
     3279#else
     3280    UNUSED_PARAM(mode);
     3281#endif
    32763282}
    32773283

  • trunk/Source/WebKit/ChangeLog

    r264710 r264719  
     12020-07-22  Jer Noble  <jer.noble@apple.com>
     2
     3        Unreviewed build fix after r264710; add a HAVE_AVPLAYER_VIDEORANGEOVERRIDE guard.
     4
     5        * WebProcess/cocoa/WebProcessCocoa.mm:
     6        (WebKit::WebProcess::updatePageScreenProperties):
     7
    182020-07-22  Jer Noble  <jer.noble@apple.com>
    29

  • trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

    r264710 r264719  
    10151015void WebProcess::updatePageScreenProperties()
    10161016{
     1017#if HAVE(AVPLAYER_VIDEORANGEOVERRIDE)
    10171018    // If AVPlayer.videoRangeOverride support is present, there's no need to override HDR mode
    10181019    // at the MediaToolbox level, as the MediaToolbox override functionality is both duplicative
    … …  
    10201021    if (PAL::isAVFoundationFrameworkAvailable() && [PAL::getAVPlayerClass() instancesRespondToSelector:@selector(setVideoRangeOverride:)])
    10211022        return;
     1023#endif
    10221024
    10231025    if (hasProcessPrivilege(ProcessPrivilege::CanCommunicateWithWindowServer)) {
Note: See TracChangeset for help on using the changeset viewer.