Title: [186946] branches/safari-601.1-branch/Source/WebCore
- Revision
- 186946
- Author
- [email protected]
- Date
- 2015-07-16 23:15:23 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186799. rdar://problem/20542574
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186945 => 186946)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 06:15:19 UTC (rev 186945)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 06:15:23 UTC (rev 186946)
@@ -1,5 +1,18 @@
2015-07-16 Matthew Hanson <[email protected]>
+ Merge r186799. rdar://problem/20542574
+
+ 2015-07-13 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed build fix.
+
+ * platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp:
+ (WebCore::InbandTextTrackPrivateAVCF::readNativeSampleBuffer): Don't try to build
+ the new Legible Output API features if they aren't available in the build
+ environment.
+
+2015-07-16 Matthew Hanson <[email protected]>
+
Merge r186798. rdar://problem/20542574
2015-07-13 Brent Fulgham <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp (186945 => 186946)
--- branches/safari-601.1-branch/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp 2015-07-17 06:15:19 UTC (rev 186945)
+++ branches/safari-601.1-branch/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp 2015-07-17 06:15:23 UTC (rev 186946)
@@ -189,6 +189,7 @@
bool InbandTextTrackPrivateAVCF::readNativeSampleBuffer(CFArrayRef nativeSamples, CFIndex index, RefPtr<ArrayBuffer>& buffer, MediaTime& duration, CMFormatDescriptionRef& formatDescription)
{
+#if HAVE(AVCFPLAYERITEM_CALLBACK_VERSION_2)
const AVCFPlayerItemLegibleOutputSample* sampleBuffer = reinterpret_cast<const AVCFPlayerItemLegibleOutputSample*>(CFArrayGetValueAtIndex(nativeSamples, index));
if (!sampleBuffer)
return false;
@@ -208,6 +209,9 @@
buffer = ArrayBuffer::create(m_sampleInputBuffer.data(), m_sampleInputBuffer.size());
return true;
+#else
+ return InbandTextTrackPrivateAVF::readNativeSampleBuffer(nativeSamples, index, buffer, duration, formatDescription);
+#endif
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
