Title: [185569] trunk/Source/WebCore
- Revision
- 185569
- Author
- [email protected]
- Date
- 2015-06-15 15:48:32 -0700 (Mon, 15 Jun 2015)
Log Message
REGRESSION(r175251, Mavericks Only): Playback may stall
https://bugs.webkit.org/show_bug.cgi?id=145989
<rdar://problem/21271919>
Reviewed by Dean Jackson.
Revert r175251 for Mavericks build targets.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoOutput):
(WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (185568 => 185569)
--- trunk/Source/WebCore/ChangeLog 2015-06-15 22:27:00 UTC (rev 185568)
+++ trunk/Source/WebCore/ChangeLog 2015-06-15 22:48:32 UTC (rev 185569)
@@ -1,3 +1,18 @@
+2015-06-15 Brent Fulgham <[email protected]>
+
+ REGRESSION(r175251, Mavericks Only): Playback may stall
+ https://bugs.webkit.org/show_bug.cgi?id=145989
+ <rdar://problem/21271919>
+
+ Reviewed by Dean Jackson.
+
+ Revert r175251 for Mavericks build targets.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoOutput):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput):
+
2015-06-15 Darin Adler <[email protected]>
REGRESSION (r182215): Reproducible crash at drawsvg.org due to reentrant layout
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (185568 => 185569)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-06-15 22:27:00 UTC (rev 185568)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-06-15 22:48:32 UTC (rev 185569)
@@ -653,7 +653,7 @@
if (!m_videoLayer)
createAVPlayerLayer();
-#if USE(VIDEOTOOLBOX)
+#if USE(VIDEOTOOLBOX) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
if (!m_videoOutput)
createVideoOutput();
#endif
@@ -2254,7 +2254,7 @@
if (!m_avPlayerItem || m_videoOutput)
return;
-#if USE(VIDEOTOOLBOX)
+#if USE(VIDEOTOOLBOX) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
NSDictionary* attributes = nil;
#else
NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:kCVPixelFormatType_32BGRA], kCVPixelBufferPixelFormatTypeKey,
@@ -2267,6 +2267,10 @@
[m_avPlayerItem.get() addOutput:m_videoOutput.get()];
+#if USE(VIDEOTOOLBOX) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED < 101000)
+ waitForVideoOutputMediaDataWillChange();
+#endif
+
LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createVideoOutput(%p) - returning %p", this, m_videoOutput.get());
}
@@ -2387,8 +2391,10 @@
void MediaPlayerPrivateAVFoundationObjC::paintWithVideoOutput(GraphicsContext* context, const FloatRect& outputRect)
{
+#if (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
if (m_videoOutput && !m_lastImage && !videoOutputHasAvailableFrame())
waitForVideoOutputMediaDataWillChange();
+#endif
updateLastImage();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
