Title: [214925] trunk/Source/WebCore
- Revision
- 214925
- Author
- [email protected]
- Date
- 2017-04-04 20:26:03 -0700 (Tue, 04 Apr 2017)
Log Message
Unreviewed, rolling out r214894, r214895, r214907, r214912,
and r214918.
https://bugs.webkit.org/show_bug.cgi?id=170491
Caused build failures on Mac (Requested by rniwa on #webkit).
Reverted changesets:
"Build fix."
http://trac.webkit.org/changeset/214894
"Rolling back the build fix, as it broke other builds."
http://trac.webkit.org/changeset/214895
"Move AVSampleBufferDisplayLayer declarations into
AVFoundationSPI.h"
https://bugs.webkit.org/show_bug.cgi?id=170471
http://trac.webkit.org/changeset/214907
"Unreviewed build fix: fix compilation error on Sierra."
http://trac.webkit.org/changeset/214912
"More build fixing."
http://trac.webkit.org/changeset/214918
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (214924 => 214925)
--- trunk/Source/WebCore/ChangeLog 2017-04-05 02:50:51 UTC (rev 214924)
+++ trunk/Source/WebCore/ChangeLog 2017-04-05 03:26:03 UTC (rev 214925)
@@ -1,3 +1,30 @@
+2017-04-04 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r214894, r214895, r214907, r214912,
+ and r214918.
+ https://bugs.webkit.org/show_bug.cgi?id=170491
+
+ Caused build failures on Mac (Requested by rniwa on #webkit).
+
+ Reverted changesets:
+
+ "Build fix."
+ http://trac.webkit.org/changeset/214894
+
+ "Rolling back the build fix, as it broke other builds."
+ http://trac.webkit.org/changeset/214895
+
+ "Move AVSampleBufferDisplayLayer declarations into
+ AVFoundationSPI.h"
+ https://bugs.webkit.org/show_bug.cgi?id=170471
+ http://trac.webkit.org/changeset/214907
+
+ "Unreviewed build fix: fix compilation error on Sierra."
+ http://trac.webkit.org/changeset/214912
+
+ "More build fixing."
+ http://trac.webkit.org/changeset/214918
+
2017-04-04 Youenn Fablet <[email protected]>
[Mac] Add back web audio support for getUserMedia MediaStreamTrack
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (214924 => 214925)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-04-05 02:50:51 UTC (rev 214924)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2017-04-05 03:26:03 UTC (rev 214925)
@@ -73,6 +73,12 @@
#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 (214924 => 214925)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-04-05 02:50:51 UTC (rev 214924)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm 2017-04-05 03:26:03 UTC (rev 214925)
@@ -98,6 +98,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 (214924 => 214925)
--- trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-04-05 02:50:51 UTC (rev 214924)
+++ trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-04-05 03:26:03 UTC (rev 214925)
@@ -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,37 +180,7 @@
NS_ASSUME_NONNULL_END
-#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>)
+#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
