Title: [210304] trunk/Source/WebCore
- Revision
- 210304
- Author
- [email protected]
- Date
- 2017-01-04 16:44:07 -0800 (Wed, 04 Jan 2017)
Log Message
Unreviewed, rolling out r210296.
This change broke macOS builds.
Reverted changeset:
"Check for the existence of
AVSampleBufferDisplayLayer_Private.h in AVFoundationSPI.h"
https://bugs.webkit.org/show_bug.cgi?id=166691
http://trac.webkit.org/changeset/210296
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (210303 => 210304)
--- trunk/Source/WebCore/ChangeLog 2017-01-05 00:42:13 UTC (rev 210303)
+++ trunk/Source/WebCore/ChangeLog 2017-01-05 00:44:07 UTC (rev 210304)
@@ -1,5 +1,18 @@
2017-01-04 Ryan Haddad <[email protected]>
+ Unreviewed, rolling out r210296.
+
+ This change broke macOS builds.
+
+ Reverted changeset:
+
+ "Check for the existence of
+ AVSampleBufferDisplayLayer_Private.h in AVFoundationSPI.h"
+ https://bugs.webkit.org/show_bug.cgi?id=166691
+ http://trac.webkit.org/changeset/210296
+
+2017-01-04 Ryan Haddad <[email protected]>
+
Unreviewed, rolling out r210287.
This change caused editing test failures on macOS.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (210303 => 210304)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-01-05 00:42:13 UTC (rev 210303)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-01-05 00:44:07 UTC (rev 210304)
@@ -73,6 +73,26 @@
#define AVAudioTimePitchAlgorithmVarispeed getAVAudioTimePitchAlgorithmVarispeed()
#pragma mark -
+#pragma mark AVSampleBufferDisplayLayer
+
+@interface AVSampleBufferDisplayLayer : CALayer
+@end
+
+#pragma mark -
+#pragma mark AVVideoPerformanceMetrics
+
+@interface AVVideoPerformanceMetrics : NSObject
+- (unsigned long)totalNumberOfVideoFrames;
+- (unsigned long)numberOfDroppedVideoFrames;
+- (unsigned long)numberOfCorruptedVideoFrames;
+- (double)totalFrameDelay;
+@end
+
+@interface AVSampleBufferDisplayLayer (WebCoreAVSampleBufferDisplayLayerPrivate)
+- (AVVideoPerformanceMetrics *)videoPerformanceMetrics;
+@end
+
+#pragma mark -
#pragma mark AVStreamSession
@interface AVStreamSession : NSObject
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (210303 => 210304)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-01-05 00:42:13 UTC (rev 210303)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-01-05 00:44:07 UTC (rev 210304)
@@ -97,6 +97,20 @@
@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 (210303 => 210304)
--- trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-01-05 00:42:13 UTC (rev 210303)
+++ trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-01-05 00:44:07 UTC (rev 210304)
@@ -163,19 +163,8 @@
#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;
@@ -191,8 +180,6 @@
NS_ASSUME_NONNULL_END
-#endif // __has_include(<AVFoundation/AVSampleBufferRenderSynchronizer.h>)
-
#if __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
#import <AVFoundation/AVSampleBufferAudioRenderer.h>
#else
@@ -215,30 +202,3 @@
NS_ASSUME_NONNULL_END
#endif // __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
-
-#if __has_include(<AVFoundation/AVSampleBufferDisplayLayer_Private.h>)
-#import <AVFoundation/AVSampleBufferDisplayLayer_Private.h>
-#else
-
-#import <AVFoundation/AVSampleBufferDisplayLayer.h>
-
-#pragma mark -
-#pragma mark AVVideoPerformanceMetrics
-
-@interface AVVideoPerformanceMetrics : NSObject
-- (unsigned long)totalNumberOfVideoFrames;
-- (unsigned long)numberOfDroppedVideoFrames;
-- (unsigned long)numberOfCorruptedVideoFrames;
-- (double)totalFrameDelay;
-@end
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface AVSampleBufferDisplayLayer (WebCoreAVSampleBufferDisplayLayerPrivate)
-- (AVVideoPerformanceMetrics *)videoPerformanceMetrics;
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif // __has_include(<AVFoundation/AVSampleBufferDisplayLayer_Private.h>)
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
