Title: [214907] trunk/Source/WebCore
- Revision
- 214907
- Author
- [email protected]
- Date
- 2017-04-04 15:30:04 -0700 (Tue, 04 Apr 2017)
Log Message
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:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::addDisplayLayer): Deleted.
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::removeDisplayLayer): Deleted.
* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
* platform/spi/mac/AVFoundationSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (214906 => 214907)
--- trunk/Source/WebCore/ChangeLog 2017-04-04 22:23:46 UTC (rev 214906)
+++ trunk/Source/WebCore/ChangeLog 2017-04-04 22:30:04 UTC (rev 214907)
@@ -1,3 +1,18 @@
+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:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::addDisplayLayer): Deleted.
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::removeDisplayLayer): Deleted.
+ * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+ * platform/spi/mac/AVFoundationSPI.h:
+
2017-04-04 Saam Barati <[email protected]>
WebAssembly: JSWebAssemblyCallee should not be a JSCell
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (214906 => 214907)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-04-04 22:23:46 UTC (rev 214906)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-04-04 22:30:04 UTC (rev 214907)
@@ -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: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (214906 => 214907)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-04-04 22:23:46 UTC (rev 214906)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-04-04 22:30:04 UTC (rev 214907)
@@ -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: trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (214906 => 214907)
--- trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-04-04 22:23:46 UTC (rev 214906)
+++ trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-04-04 22:30:04 UTC (rev 214907)
@@ -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,6 +191,32 @@
NS_ASSUME_NONNULL_END
+#endif // __has_include(<AVFoundation/AVSampleBufferRenderSynchronizer.h>)
+
+#if __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 __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
#import <AVFoundation/AVSampleBufferAudioRenderer.h>
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
