Title: [186799] trunk/Source/WebCore
- Revision
- 186799
- Author
- bfulg...@apple.com
- Date
- 2015-07-13 18:58:28 -0700 (Mon, 13 Jul 2015)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186798 => 186799)
--- trunk/Source/WebCore/ChangeLog 2015-07-14 01:11:12 UTC (rev 186798)
+++ trunk/Source/WebCore/ChangeLog 2015-07-14 01:58:28 UTC (rev 186799)
@@ -1,5 +1,14 @@
2015-07-13 Brent Fulgham <bfulg...@apple.com>
+ [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-13 Brent Fulgham <bfulg...@apple.com>
+
[Win] Update Media Player logic for new Legible Output API
https://bugs.webkit.org/show_bug.cgi?id=146922
<rdar://problem/20542574>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp (186798 => 186799)
--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp 2015-07-14 01:11:12 UTC (rev 186798)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp 2015-07-14 01:58:28 UTC (rev 186799)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
