Title: [236525] tags/Safari-607.1.7.3/Source/WebCore
- Revision
- 236525
- Author
- kocsen_ch...@apple.com
- Date
- 2018-09-26 14:53:08 -0700 (Wed, 26 Sep 2018)
Log Message
Cherry-pick r236350. rdar://problem/44808777
Move AVVideoPerformanceMetrics into AVFoundationSPI.h
https://bugs.webkit.org/show_bug.cgi?id=189842
Reviewed by Jon Lee.
Source/WebCore:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
Source/WebCore/PAL:
* pal/spi/mac/AVFoundationSPI.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236350 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-607.1.7.3/Source/WebCore/ChangeLog (236524 => 236525)
--- tags/Safari-607.1.7.3/Source/WebCore/ChangeLog 2018-09-26 21:52:21 UTC (rev 236524)
+++ tags/Safari-607.1.7.3/Source/WebCore/ChangeLog 2018-09-26 21:53:08 UTC (rev 236525)
@@ -1,5 +1,34 @@
2018-09-26 Babak Shafiei <bshaf...@apple.com>
+ Cherry-pick r236350. rdar://problem/44808777
+
+ Move AVVideoPerformanceMetrics into AVFoundationSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=189842
+
+ Reviewed by Jon Lee.
+
+ Source/WebCore:
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+
+ Source/WebCore/PAL:
+
+ * pal/spi/mac/AVFoundationSPI.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236350 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-09-21 Jer Noble <jer.no...@apple.com>
+
+ Move AVVideoPerformanceMetrics into AVFoundationSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=189842
+
+ Reviewed by Jon Lee.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+
+2018-09-26 Babak Shafiei <bshaf...@apple.com>
+
Cherry-pick r236288. rdar://problem/43659749
Release assert under RenderView::pageOrViewLogicalHeight
Modified: tags/Safari-607.1.7.3/Source/WebCore/PAL/ChangeLog (236524 => 236525)
--- tags/Safari-607.1.7.3/Source/WebCore/PAL/ChangeLog 2018-09-26 21:52:21 UTC (rev 236524)
+++ tags/Safari-607.1.7.3/Source/WebCore/PAL/ChangeLog 2018-09-26 21:53:08 UTC (rev 236525)
@@ -1,3 +1,32 @@
+2018-09-26 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r236350. rdar://problem/44808777
+
+ Move AVVideoPerformanceMetrics into AVFoundationSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=189842
+
+ Reviewed by Jon Lee.
+
+ Source/WebCore:
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+
+ Source/WebCore/PAL:
+
+ * pal/spi/mac/AVFoundationSPI.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236350 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-09-21 Jer Noble <jer.no...@apple.com>
+
+ Move AVVideoPerformanceMetrics into AVFoundationSPI.h
+ https://bugs.webkit.org/show_bug.cgi?id=189842
+
+ Reviewed by Jon Lee.
+
+ * pal/spi/mac/AVFoundationSPI.h:
+
2018-09-14 Eric Carlson <eric.carl...@apple.com>
Support arbitrary video resolution in getUserMedia API
Modified: tags/Safari-607.1.7.3/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (236524 => 236525)
--- tags/Safari-607.1.7.3/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-09-26 21:52:21 UTC (rev 236524)
+++ tags/Safari-607.1.7.3/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-09-26 21:53:08 UTC (rev 236525)
@@ -156,6 +156,15 @@
#endif
#endif // !PLATFORM(IOS)
+
+@interface AVVideoPerformanceMetrics : NSObject
+@property (nonatomic, readonly) unsigned long totalNumberOfVideoFrames;
+@property (nonatomic, readonly) unsigned long numberOfDroppedVideoFrames;
+@property (nonatomic, readonly) unsigned long numberOfCorruptedVideoFrames;
+@property (nonatomic, readonly) unsigned long numberOfNonDisplayCompositedVideoFrames;
+@property (nonatomic, readonly) double totalFrameDelay;
+@end
+
#endif // USE(APPLE_INTERNAL_SDK)
#if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
@@ -227,8 +236,15 @@
#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
#import <AVFoundation/AVQueuedSampleBufferRendering.h>
+#elif __has_include(<AVFoundation/AVSampleBufferDisplayLayer_Private.h>)
+#import <AVFoundation/AVSampleBufferDisplayLayer_Private.h>
#elif __has_include(<AVFoundation/AVSampleBufferDisplayLayer.h>)
#import <AVFoundation/AVSampleBufferDisplayLayer.h>
+NS_ASSUME_NONNULL_BEGIN
+@interface AVSampleBufferDisplayLayer (VideoPerformanceMetrics)
+- (AVVideoPerformanceMetrics *)videoPerformanceMetrics;
+@end
+NS_ASSUME_NONNULL_END
#else
NS_ASSUME_NONNULL_BEGIN
@@ -245,10 +261,9 @@
- (BOOL)isReadyForMoreMediaData;
- (void)requestMediaDataWhenReadyOnQueue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
- (void)stopRequestingMediaData;
+- (AVVideoPerformanceMetrics *)videoPerformanceMetrics;
@end
-
NS_ASSUME_NONNULL_END
-
#endif // __has_include(<AVFoundation/AVSampleBufferDisplayLayer.h>)
#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
Modified: tags/Safari-607.1.7.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (236524 => 236525)
--- tags/Safari-607.1.7.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2018-09-26 21:52:21 UTC (rev 236524)
+++ tags/Safari-607.1.7.3/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2018-09-26 21:53:08 UTC (rev 236525)
@@ -80,20 +80,6 @@
#define AVAudioTimePitchAlgorithmVarispeed getAVAudioTimePitchAlgorithmVarispeed()
#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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
