Title: [230265] trunk/Source/WebCore
- Revision
- 230265
- Author
- [email protected]
- Date
- 2018-04-04 10:43:55 -0700 (Wed, 04 Apr 2018)
Log Message
Fix the !HAVE(AVFOUNDATION_VIDEO_OUTPUT) build
https://bugs.webkit.org/show_bug.cgi?id=184309
-and corresponding-
rdar://problem/39179126
Reviewed by Jer Noble.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230264 => 230265)
--- trunk/Source/WebCore/ChangeLog 2018-04-04 17:42:11 UTC (rev 230264)
+++ trunk/Source/WebCore/ChangeLog 2018-04-04 17:43:55 UTC (rev 230265)
@@ -1,3 +1,16 @@
+2018-04-04 Beth Dakin <[email protected]>
+
+ Fix the !HAVE(AVFOUNDATION_VIDEO_OUTPUT) build
+ https://bugs.webkit.org/show_bug.cgi?id=184309
+ -and corresponding-
+ rdar://problem/39179126
+
+ Reviewed by Jer Noble.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
+
2018-04-04 Youenn Fablet <[email protected]>
MockRealtimeVideoSourceMac should produce kCVPixelFormatType_420YpCbCr8Planar buffers
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (230264 => 230265)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-04-04 17:42:11 UTC (rev 230264)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-04-04 17:43:55 UTC (rev 230265)
@@ -1168,14 +1168,20 @@
void MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage()
{
+#if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
updateLastImage(UpdateType::UpdateSynchronously);
m_videoFullscreenLayerManager->updateVideoFullscreenInlineImage(m_lastImage);
+#endif
}
void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer(PlatformLayer* videoFullscreenLayer, Function<void()>&& completionHandler)
{
+#if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
updateLastImage(UpdateType::UpdateSynchronously);
m_videoFullscreenLayerManager->setVideoFullscreenLayer(videoFullscreenLayer, WTFMove(completionHandler), m_lastImage);
+#else
+ m_videoFullscreenLayerManager->setVideoFullscreenLayer(videoFullscreenLayer, WTFMove(completionHandler), nil);
+#endif
updateDisableExternalPlayback();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes