[webkit-changes] [214988] tags/Safari-604.1.14.3/Source/WebCore

Wed, 05 Apr 2017 21:46:06 -0700

Title: [214988] tags/Safari-604.1.14.3/Source/WebCore

Diff

Modified: tags/Safari-604.1.14.3/Source/WebCore/ChangeLog (214987 => 214988)


--- tags/Safari-604.1.14.3/Source/WebCore/ChangeLog	2017-04-06 04:44:35 UTC (rev 214987)
+++ tags/Safari-604.1.14.3/Source/WebCore/ChangeLog	2017-04-06 04:45:37 UTC (rev 214988)
@@ -1,3 +1,20 @@
+2017-04-05  Babak Shafiei  <[email protected]>
+
+        Merge r214930.
+
+    2017-04-04  Jer Noble  <[email protected]>
+
+            Move AVSampleBufferDisplayLayer declarations into AVFoundationSPI.h
+            https://bugs.webkit.org/show_bug.cgi?id=170471
+
+            Reviewed by Eric Carlson.
+
+            Move the declaration of AVSampleBufferDisplayLayer (and related classes) into AVFoundationSPI.
+
+            * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+            * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+            * platform/spi/mac/AVFoundationSPI.h:
+
 2017-03-29  Jason Marcell  <[email protected]>
 
         Cherry-pick r214435. rdar://problem/31303823

Modified: tags/Safari-604.1.14.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (214987 => 214988)


--- tags/Safari-604.1.14.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm	2017-04-06 04:44:35 UTC (rev 214987)
+++ tags/Safari-604.1.14.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm	2017-04-06 04:45:37 UTC (rev 214988)
@@ -73,12 +73,6 @@
 #define AVAudioTimePitchAlgorithmVarispeed getAVAudioTimePitchAlgorithmVarispeed()
 
 #pragma mark -
-#pragma mark AVSampleBufferDisplayLayer
-
-@interface AVSampleBufferDisplayLayer : CALayer
-@end
-
-#pragma mark -
 #pragma mark AVVideoPerformanceMetrics
 
 @interface AVVideoPerformanceMetrics : NSObject

Modified: tags/Safari-604.1.14.3/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (214987 => 214988)


--- tags/Safari-604.1.14.3/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm	2017-04-06 04:44:35 UTC (rev 214987)
+++ tags/Safari-604.1.14.3/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm	2017-04-06 04:45:37 UTC (rev 214988)
@@ -98,20 +98,6 @@
 @end
 
 #pragma mark -
-#pragma mark AVSampleBufferDisplayLayer
-
-@interface AVSampleBufferDisplayLayer : CALayer
-- (NSInteger)status;
-- (NSError*)error;
-- (void)enqueueSampleBuffer:(CMSampleBufferRef)sampleBuffer;
-- (void)flush;
-- (void)flushAndRemoveImage;
-- (BOOL)isReadyForMoreMediaData;
-- (void)requestMediaDataWhenReadyOnQueue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
-- (void)stopRequestingMediaData;
-@end
-
-#pragma mark -
 #pragma mark WebAVStreamDataParserListener
 
 @interface WebAVStreamDataParserListener : NSObject<AVStreamDataParserOutputHandling> {

Modified: tags/Safari-604.1.14.3/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (214987 => 214988)


--- tags/Safari-604.1.14.3/Source/WebCore/platform/spi/mac/AVFoundationSPI.h	2017-04-06 04:44:35 UTC (rev 214987)
+++ tags/Safari-604.1.14.3/Source/WebCore/platform/spi/mac/AVFoundationSPI.h	2017-04-06 04:45:37 UTC (rev 214988)
@@ -163,8 +163,19 @@
 #import <CoreMedia/CMSampleBuffer.h>
 #import <CoreMedia/CMSync.h>
 
+#if __has_include(<AVFoundation/AVSampleBufferRenderSynchronizer.h>)
+#import <AVFoundation/AVSampleBufferRenderSynchronizer.h>
+
 NS_ASSUME_NONNULL_BEGIN
+@interface AVSampleBufferRenderSynchronizer (AVSampleBufferRenderSynchronizerPrivate)
+- (void)removeRenderer:(id)renderer atTime:(CMTime)time withCompletionHandler:(void (^)(BOOL didRemoveRenderer))completionHandler;
+@end
+NS_ASSUME_NONNULL_END
 
+#else
+
+NS_ASSUME_NONNULL_BEGIN
+
 @interface AVSampleBufferRenderSynchronizer : NSObject
 - (CMTimebaseRef)timebase;
 - (float)rate;
@@ -180,7 +191,37 @@
 
 NS_ASSUME_NONNULL_END
 
-#if __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
+#endif // __has_include(<AVFoundation/AVSampleBufferRenderSynchronizer.h>)
+
+#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
+#import <AVFoundation/AVQueuedSampleBufferRendering.h>
+#elif __has_include(<AVFoundation/AVSampleBufferDisplayLayer.h>)
+#import <AVFoundation/AVSampleBufferDisplayLayer.h>
+#else
+
+NS_ASSUME_NONNULL_BEGIN
+
+#pragma mark -
+#pragma mark AVSampleBufferDisplayLayer
+
+@interface AVSampleBufferDisplayLayer : CALayer
+- (NSInteger)status;
+- (NSError*)error;
+- (void)enqueueSampleBuffer:(CMSampleBufferRef)sampleBuffer;
+- (void)flush;
+- (void)flushAndRemoveImage;
+- (BOOL)isReadyForMoreMediaData;
+- (void)requestMediaDataWhenReadyOnQueue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
+- (void)stopRequestingMediaData;
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif // __has_include(<AVFoundation/AVSampleBufferDisplayLayer.h>)
+
+#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
+// Nothing to do, AVfoundation/AVQueuedSampleBufferRendering.h was imported above.
+#elif __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
 #import <AVFoundation/AVSampleBufferAudioRenderer.h>
 #else
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to