Title: [153716] branches/safari-537-branch/Source/WebCore
- Revision
- 153716
- Author
- [email protected]
- Date
- 2013-08-05 12:27:42 -0700 (Mon, 05 Aug 2013)
Log Message
Merged r153377. <rdar://problem/13011371>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153715 => 153716)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-05 19:25:13 UTC (rev 153715)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-05 19:27:42 UTC (rev 153716)
@@ -1,5 +1,23 @@
2013-08-05 Lucas Forschler <[email protected]>
+ Merge r153377
+
+ 2013-07-26 Brent Fulgham <[email protected]>
+
+ [Windows] Remove workarounds now that rdar://problem/14390466 is fixed.
+ https://bugs.webkit.org/show_bug.cgi?id=119150
+
+ Reviewed by Anders Carlsson.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::AVFWrapper::createPlayer): Remove workaround to add legible output
+ after player is created.
+ (WebCore::AVFWrapper::createPlayerItem): Remove workaround to delay adding
+ legible output until player is created.
+ (WebCore::AVFWrapper::platformLayer): Get rid of unused temporary.
+
+2013-08-05 Lucas Forschler <[email protected]>
+
Merge r152861
2013-07-17 Brent Fulgham <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (153715 => 153716)
--- branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-08-05 19:25:13 UTC (rev 153715)
+++ branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-08-05 19:27:42 UTC (rev 153716)
@@ -1307,13 +1307,6 @@
if (m_d3dDevice && AVCFPlayerSetDirect3DDevicePtr())
AVCFPlayerSetDirect3DDevicePtr()(playerRef, m_d3dDevice.get());
-#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
- // Because of a bug in AVFoundationCF, we have to wait until the player is created before we can add the legible output:
- // Once <rdar://problem/14390466> this is fixed, we can remove the following two lines.
- ::Sleep(1000); // FIXME: This is being fixed as part of <rdar://problem/14390466>
- AVCFPlayerItemAddOutput(avPlayerItem(), legibleOutput());
-#endif
-
CFNotificationCenterRef center = CFNotificationCenterGetLocalCenter();
ASSERT(center);
@@ -1364,9 +1357,7 @@
AVCFPlayerItemLegibleOutputSetCallbacks(m_legibleOutput.get(), &callbackInfo, dispatch_get_main_queue());
AVCFPlayerItemLegibleOutputSetAdvanceIntervalForCallbackInvocation(m_legibleOutput.get(), legibleOutputAdvanceInterval);
AVCFPlayerItemLegibleOutputSetTextStylingResolution(m_legibleOutput.get(), AVCFPlayerItemLegibleOutputTextStylingResolutionSourceAndRulesOnly);
- // We cannot add the Legible Output to the player item until the player is constructed. <rdar://problem/14390466>
- // Once this is fixed, we can uncomment the following line.
- // AVCFPlayerItemAddOutput(m_avPlayerItem.get(), m_legibleOutput.get());
+ AVCFPlayerItemAddOutput(m_avPlayerItem.get(), m_legibleOutput.get());
#endif
}
@@ -1575,8 +1566,7 @@
if (!m_videoLayerWrapper)
return 0;
- CACFLayerRef layerRef = AVCFPlayerLayerCopyCACFLayer(m_avCFVideoLayer.get());
- m_caVideoLayer = adoptCF(layerRef);
+ m_caVideoLayer = adoptCF(AVCFPlayerLayerCopyCACFLayer(m_avCFVideoLayer.get()));
CACFLayerInsertSublayer(m_videoLayerWrapper->platformLayer(), m_caVideoLayer.get(), 0);
m_videoLayerWrapper->setAnchorPoint(FloatPoint3D());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
