diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm index 99d99fe0e61a..722aa9557a20 100644 --- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm +++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm @@ -2026,8 +2026,10 @@ static URL conformFragmentIdentifierForURL(const URL& url) MonotonicTime start = MonotonicTime::now(); [m_imageGenerator setMaximumSize:CGSize(rect.size())]; +ALLOW_DEPRECATED_DECLARATIONS_BEGIN RetainPtr rawImage = adoptCF([m_imageGenerator copyCGImageAtTime:PAL::CMTimeMakeWithSeconds(time, 600) actualTime:nil error:nil]); RetainPtr image = adoptCF(CGImageCreateCopyWithColorSpace(rawImage.get(), sRGBColorSpaceRef())); +ALLOW_DEPRECATED_DECLARATIONS_END INFO_LOG(LOGIDENTIFIER, "creating image took ", (MonotonicTime::now() - start).seconds()); @@ -2274,7 +2276,9 @@ static void fulfillRequestWithKeyData(AVAssetResourceLoadingRequest *request, Ar for (NSLocale *locale in [m_avAsset availableChapterLocales]) { +ALLOW_DEPRECATED_DECLARATIONS_BEGIN auto chapters = [m_avAsset chapterMetadataGroupsWithTitleLocale:locale containingItemsWithCommonKeys:@[AVMetadataCommonKeyArtwork]]; +ALLOW_DEPRECATED_DECLARATIONS_END if (!chapters.count) continue; @@ -2967,6 +2971,7 @@ void determineChangedTracksFromNewTracksAndOldItems(MediaSelectionGroupAVFObjC* if ([m_avAsset statusOfValueForKey:@"tracks" error:NULL] != AVKeyValueStatusLoaded) return nil; +ALLOW_DEPRECATED_DECLARATIONS_BEGIN return [] (NSArray* tracks) -> AVAssetTrack* { NSUInteger index = [tracks indexOfObjectPassingTest:^(id obj, NSUInteger, BOOL *) { return [static_cast(obj) isEnabled]; @@ -2975,6 +2980,7 @@ void determineChangedTracksFromNewTracksAndOldItems(MediaSelectionGroupAVFObjC* return nil; return [tracks objectAtIndex:index]; }([m_avAsset tracksWithMediaCharacteristic:characteristic]); +ALLOW_DEPRECATED_DECLARATIONS_END } AVAssetTrack* MediaPlayerPrivateAVFoundationObjC::firstEnabledAudibleTrack() const @@ -3002,8 +3008,9 @@ void determineChangedTracksFromNewTracksAndOldItems(MediaSelectionGroupAVFObjC* { if (!hasLoadedMediaSelectionGroups()) return nil; - +ALLOW_DEPRECATED_DECLARATIONS_BEGIN return [m_avAsset mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicLegible]; +ALLOW_DEPRECATED_DECLARATIONS_END } AVMediaSelectionGroup* MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForAudibleMedia() @@ -3011,7 +3018,9 @@ void determineChangedTracksFromNewTracksAndOldItems(MediaSelectionGroupAVFObjC* if (!hasLoadedMediaSelectionGroups()) return nil; +ALLOW_DEPRECATED_DECLARATIONS_BEGIN return [m_avAsset mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicAudible]; +ALLOW_DEPRECATED_DECLARATIONS_END } AVMediaSelectionGroup* MediaPlayerPrivateAVFoundationObjC::safeMediaSelectionGroupForVisualMedia() @@ -3019,7 +3028,9 @@ void determineChangedTracksFromNewTracksAndOldItems(MediaSelectionGroupAVFObjC* if (!hasLoadedMediaSelectionGroups()) return nil; +ALLOW_DEPRECATED_DECLARATIONS_BEGIN return [m_avAsset mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicVisual]; +ALLOW_DEPRECATED_DECLARATIONS_END } void MediaPlayerPrivateAVFoundationObjC::processMediaSelectionOptions() @@ -3148,10 +3159,10 @@ void determineChangedTracksFromNewTracksAndOldItems(MediaSelectionGroupAVFObjC* return emptyString(); // If AVFoundation has an audible group, return the language of the currently selected audible option. +ALLOW_DEPRECATED_DECLARATIONS_BEGIN AVMediaSelectionGroup *audibleGroup = [m_avAsset mediaSelectionGroupForMediaCharacteristic:AVMediaCharacteristicAudible]; - ALLOW_DEPRECATED_DECLARATIONS_BEGIN AVMediaSelectionOption *currentlySelectedAudibleOption = [m_avPlayerItem selectedMediaOptionInMediaSelectionGroup:audibleGroup]; - ALLOW_DEPRECATED_DECLARATIONS_END +ALLOW_DEPRECATED_DECLARATIONS_END if (currentlySelectedAudibleOption) { m_languageOfPrimaryAudioTrack = [[currentlySelectedAudibleOption locale] localeIdentifier]; INFO_LOG(LOGIDENTIFIER, "language of selected audible option ", m_languageOfPrimaryAudioTrack); @@ -3161,7 +3172,9 @@ void determineChangedTracksFromNewTracksAndOldItems(MediaSelectionGroupAVFObjC* // AVFoundation synthesizes an audible group when there is only one ungrouped audio track if there is also a legible group (one or // more in-band text tracks). It doesn't know about out-of-band tracks, so if there is a single audio track return its language. +ALLOW_DEPRECATED_DECLARATIONS_BEGIN NSArray *tracks = [m_avAsset tracksWithMediaType:AVMediaTypeAudio]; +ALLOW_DEPRECATED_DECLARATIONS_END if (!tracks || [tracks count] != 1) { m_languageOfPrimaryAudioTrack = emptyString(); INFO_LOG(LOGIDENTIFIER, tracks ? [tracks count] : 0, " audio tracks, returning empty"); diff --git a/Source/WebKit/Shared/Cocoa/WebIconUtilities.mm b/Source/WebKit/Shared/Cocoa/WebIconUtilities.mm index 528ffa7ff06e..463f4ba3ee36 100644 --- a/Source/WebKit/Shared/Cocoa/WebIconUtilities.mm +++ b/Source/WebKit/Shared/Cocoa/WebIconUtilities.mm @@ -147,7 +147,9 @@ PlatformImagePtr iconForVideoFile(NSURL *file) [generator setAppliesPreferredTrackTransform:YES]; NSError *error = nil; +ALLOW_DEPRECATED_DECLARATIONS_BEGIN RetainPtr imageRef = adoptCF([generator copyCGImageAtTime:PAL::kCMTimeZero actualTime:nil error:&error]); +ALLOW_DEPRECATED_DECLARATIONS_END if (!imageRef) { LOG_ERROR("Error creating image for video '%@': %@", file, error); return fallbackIconForFile(file);