Title: [236882] trunk/Source/WebCore
- Revision
- 236882
- Author
- [email protected]
- Date
- 2018-10-05 12:30:42 -0700 (Fri, 05 Oct 2018)
Log Message
Further unreviewed watchOS build fix: videoPerformanceMetrics unavailable on watchOS.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::videoPlaybackQualityMetrics):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (236881 => 236882)
--- trunk/Source/WebCore/ChangeLog 2018-10-05 19:14:46 UTC (rev 236881)
+++ trunk/Source/WebCore/ChangeLog 2018-10-05 19:30:42 UTC (rev 236882)
@@ -1,5 +1,12 @@
2018-10-05 Jer Noble <[email protected]>
+ Further unreviewed watchOS build fix: videoPerformanceMetrics unavailable on watchOS.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::videoPlaybackQualityMetrics):
+
+2018-10-05 Jer Noble <[email protected]>
+
Unreviewed watchOS build fix: videoPerformanceMetrics unavailable on watchOS.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (236881 => 236882)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-05 19:14:46 UTC (rev 236881)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-05 19:30:42 UTC (rev 236882)
@@ -3263,10 +3263,12 @@
if (![m_videoLayer respondsToSelector:@selector(videoPerformanceMetrics)])
return std::nullopt;
+#if PLATFORM(WATCHOS)
+ return std::nullopt;
+#else
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-#if !PLATFORM(WATCHOS)
auto metrics = [m_videoLayer videoPerformanceMetrics];
if (!metrics)
return std::nullopt;
@@ -3274,8 +3276,6 @@
uint32_t displayCompositedFrames = 0;
if ([metrics respondsToSelector:@selector(numberOfDisplayCompositedVideoFrames)])
displayCompositedFrames = [metrics numberOfDisplayCompositedVideoFrames];
-#endif
-#pragma clang diagnostic pop
return VideoPlaybackQualityMetrics {
static_cast<uint32_t>([metrics totalNumberOfVideoFrames]),
@@ -3284,6 +3284,8 @@
[metrics totalFrameDelay],
displayCompositedFrames,
};
+#pragma clang diagnostic pop
+#endif
}
NSArray* assetMetadataKeyNames()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
