<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186798] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186798">186798</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-07-13 18:11:12 -0700 (Mon, 13 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Update Media Player logic for new Legible Output API
https://bugs.webkit.org/show_bug.cgi?id=146922
<rdar://problem/20542574>
Reviewed by Eric Carlson.
* AVFoundationSupport.py: Check for updated AVFCF feature.
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
(WebCore::InbandTextTrackPrivateAVF::processNativeSamples): Update to call the
new 'readNativeSampleBuffer' method.
(WebCore::InbandTextTrackPrivateAVF::readNativeSampleBuffer): Added. This is a no-op
on Windows if it has the new AVCF API. Otherwise, it contains the same implementation
that has always been used in 'processNativeSamples'.
* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:
* platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp:
(WebCore::InbandTextTrackPrivateAVCF::readNativeSampleBuffer): Added. Use the new
Legible Output API instead of the old CoreMedia solution if it is available.
* platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h:
(WebCore::InbandTextTrackPrivateAVCF::mediaSelectionOption):
* platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp:
(WebCore::InbandTextTrackPrivateLegacyAVCF::readNativeSampleBuffer): Add a stub implementation.
* platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.h:
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::AVFWrapper::createPlayerItem): Use the new Legible Output API if it is available.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreAVFoundationSupportpy">trunk/Source/WebCore/AVFoundationSupport.py</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFh">trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfInbandTextTrackPrivateAVCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfInbandTextTrackPrivateAVCFh">trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreAVFoundationSupportpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/AVFoundationSupport.py (186797 => 186798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/AVFoundationSupport.py 2015-07-14 00:10:32 UTC (rev 186797)
+++ trunk/Source/WebCore/AVFoundationSupport.py 2015-07-14 01:11:12 UTC (rev 186798)
</span><span class="lines">@@ -57,3 +57,7 @@
</span><span class="cx"> regexp = re.compile("CACFLayerSetContentsScale")
</span><span class="cx"> if fileContains("/include/QuartzCore/CACFLayer.h", regexp):
</span><span class="cx"> print "#define HAVE_CACFLAYER_SETCONTENTSSCALE 1"
</span><ins>+if lookFor("/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h"):
+ regexp = re.compile("kAVCFPlayerItemLegibleOutput_CallbacksVersion_2")
+ if fileContains("/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h", regexp):
+ print "#define HAVE_AVCFPLAYERITEM_CALLBACK_VERSION_2 1"
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186797 => 186798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-14 00:10:32 UTC (rev 186797)
+++ trunk/Source/WebCore/ChangeLog 2015-07-14 01:11:12 UTC (rev 186798)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-07-13 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update Media Player logic for new Legible Output API
+ https://bugs.webkit.org/show_bug.cgi?id=146922
+ <rdar://problem/20542574>
+
+ Reviewed by Eric Carlson.
+
+ * AVFoundationSupport.py: Check for updated AVFCF feature.
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+ (WebCore::InbandTextTrackPrivateAVF::processNativeSamples): Update to call the
+ new 'readNativeSampleBuffer' method.
+ (WebCore::InbandTextTrackPrivateAVF::readNativeSampleBuffer): Added. This is a no-op
+ on Windows if it has the new AVCF API. Otherwise, it contains the same implementation
+ that has always been used in 'processNativeSamples'.
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:
+ * platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp:
+ (WebCore::InbandTextTrackPrivateAVCF::readNativeSampleBuffer): Added. Use the new
+ Legible Output API instead of the old CoreMedia solution if it is available.
+ * platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h:
+ (WebCore::InbandTextTrackPrivateAVCF::mediaSelectionOption):
+ * platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp:
+ (WebCore::InbandTextTrackPrivateLegacyAVCF::readNativeSampleBuffer): Add a stub implementation.
+ * platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.h:
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::AVFWrapper::createPlayerItem): Use the new Legible Output API if it is available.
+
</ins><span class="cx"> 2015-07-13 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: add plumbing for delivering start/end-of-interruption events
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (186797 => 186798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2015-07-14 00:10:32 UTC (rev 186797)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2015-07-14 01:11:12 UTC (rev 186798)
</span><span class="lines">@@ -489,30 +489,12 @@
</span><span class="cx"> LOG(Media, "InbandTextTrackPrivateAVF::processNativeSamples - %li sample buffers at time %.2f\n", count, presentationTime.toDouble());
</span><span class="cx">
</span><span class="cx"> for (CFIndex i = 0; i < count; i++) {
</span><del>-
- CMSampleBufferRef sampleBuffer = (CMSampleBufferRef)CFArrayGetValueAtIndex(nativeSamples, i);
- if (!sampleBuffer)
</del><ins>+ RefPtr<ArrayBuffer> buffer;
+ MediaTime duration;
+ CMFormatDescriptionRef formatDescription;
+ if (!readNativeSampleBuffer(nativeSamples, i, buffer, duration, formatDescription))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- CMSampleTimingInfo timingInfo;
- OSStatus status = CMSampleBufferGetSampleTimingInfo(sampleBuffer, i, &timingInfo);
- if (status) {
- LOG(Media, "InbandTextTrackPrivateAVF::processNativeSamples(%p) - CMSampleBufferGetSampleTimingInfo returned error %x for sample %li", this, static_cast<int>(status), i);
- continue;
- }
-
- CMBlockBufferRef blockBuffer = CMSampleBufferGetDataBuffer(sampleBuffer);
- size_t bufferLength = CMBlockBufferGetDataLength(blockBuffer);
- if (bufferLength < ISOBox::boxHeaderSize()) {
- LOG(Media, "InbandTextTrackPrivateAVF::processNativeSamples(%p) - ERROR: CMSampleBuffer size length unexpectedly small (%zu)!!", this, bufferLength);
- continue;
- }
-
- m_sampleInputBuffer.resize(m_sampleInputBuffer.size() + bufferLength);
- CMBlockBufferCopyDataBytes(blockBuffer, 0, bufferLength, m_sampleInputBuffer.data() + m_sampleInputBuffer.size() - bufferLength);
-
- RefPtr<ArrayBuffer> buffer = ArrayBuffer::create(m_sampleInputBuffer.data(), m_sampleInputBuffer.size());
-
</del><span class="cx"> String type = ISOBox::peekType(buffer.get());
</span><span class="cx"> size_t boxLength = ISOBox::peekLength(buffer.get());
</span><span class="cx"> if (boxLength > buffer->byteLength()) {
</span><span class="lines">@@ -523,7 +505,7 @@
</span><span class="cx"> LOG(Media, "InbandTextTrackPrivateAVF::processNativeSamples(%p) - chunk type = '%s', size = %zu", this, type.utf8().data(), boxLength);
</span><span class="cx">
</span><span class="cx"> if (type == ISOWebVTTCue::boxType()) {
</span><del>- ISOWebVTTCue cueData = ISOWebVTTCue(presentationTime, toMediaTime(timingInfo.duration), buffer.get());
</del><ins>+ ISOWebVTTCue cueData = ISOWebVTTCue(presentationTime, duration, buffer.get());
</ins><span class="cx"> LOG(Media, " sample presentation time = %.2f, duration = %.2f", cueData.presentationTime().toDouble(), cueData.duration().toDouble());
</span><span class="cx"> LOG(Media, " id = \"%s\", settings = \"%s\", cue text = \"%s\"", cueData.id().utf8().data(), cueData.settings().utf8().data(), cueData.cueText().utf8().data());
</span><span class="cx"> LOG(Media, " sourceID = \"%s\", originalStartTime = \"%s\"", cueData.sourceID().utf8().data(), cueData.originalStartTime().utf8().data());
</span><span class="lines">@@ -535,7 +517,6 @@
</span><span class="cx"> if (m_haveReportedVTTHeader)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- CMFormatDescriptionRef formatDescription = CMSampleBufferGetFormatDescription(sampleBuffer);
</del><span class="cx"> if (!formatDescription)
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -570,6 +551,42 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool InbandTextTrackPrivateAVF::readNativeSampleBuffer(CFArrayRef nativeSamples, CFIndex index, RefPtr<ArrayBuffer>& buffer, MediaTime& duration, CMFormatDescriptionRef& formatDescription)
+{
+#if OS(WINDOWS) && HAVE(AVCFPLAYERITEM_CALLBACK_VERSION_2)
+ return false;
+#else
+ CMSampleBufferRef const sampleBuffer = reinterpret_cast<CMSampleBufferRef>(const_cast<void*>(CFArrayGetValueAtIndex(nativeSamples, index)));
+ if (!sampleBuffer)
+ return false;
+
+ CMSampleTimingInfo timingInfo;
+ OSStatus status = CMSampleBufferGetSampleTimingInfo(sampleBuffer, index, &timingInfo);
+ if (status) {
+ LOG(Media, "InbandTextTrackPrivateAVF::readNativeSampleBuffer(%p) - CMSampleBufferGetSampleTimingInfo returned error %x for sample %li", this, static_cast<int>(status), index);
+ return false;
+ }
+
+ duration = toMediaTime(timingInfo.duration);
+
+ CMBlockBufferRef blockBuffer = CMSampleBufferGetDataBuffer(sampleBuffer);
+ size_t bufferLength = CMBlockBufferGetDataLength(blockBuffer);
+ if (bufferLength < ISOBox::boxHeaderSize()) {
+ LOG(Media, "InbandTextTrackPrivateAVF::readNativeSampleBuffer(%p) - ERROR: CMSampleBuffer size length unexpectedly small (%zu)!!", this, bufferLength);
+ return false;
+ }
+
+ m_sampleInputBuffer.resize(m_sampleInputBuffer.size() + bufferLength);
+ CMBlockBufferCopyDataBytes(blockBuffer, 0, bufferLength, m_sampleInputBuffer.data() + m_sampleInputBuffer.size() - bufferLength);
+
+ buffer = ArrayBuffer::create(m_sampleInputBuffer.data(), m_sampleInputBuffer.size());
+
+ formatDescription = CMSampleBufferGetFormatDescription(sampleBuffer);
+
+ return true;
+#endif
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(VIDEO) && (USE(AVFOUNDATION) || PLATFORM(IOS))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationInbandTextTrackPrivateAVFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h (186797 => 186798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h 2015-07-14 00:10:32 UTC (rev 186797)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h 2015-07-14 01:11:12 UTC (rev 186798)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -32,6 +32,12 @@
</span><span class="cx"> #include "InbandTextTrackPrivateClient.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><ins>+typedef const struct opaqueCMFormatDescription* CMFormatDescriptionRef;
+
+namespace JSC {
+class ArrayBuffer;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class AVFInbandTrackParent {
</span><span class="lines">@@ -70,6 +76,8 @@
</span><span class="cx"> virtual Category textTrackCategory() const = 0;
</span><span class="cx">
</span><span class="cx"> virtual MediaTime startTimeVariance() const override { return MediaTime(1, 4); }
</span><ins>+
+ virtual bool readNativeSampleBuffer(CFArrayRef nativeSamples, CFIndex, RefPtr<JSC::ArrayBuffer>&, MediaTime&, CMFormatDescriptionRef&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> InbandTextTrackPrivateAVF(AVFInbandTrackParent*, CueFormat);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfInbandTextTrackPrivateAVCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp (186797 => 186798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp 2015-07-14 00:10:32 UTC (rev 186797)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp 2015-07-14 01:11:12 UTC (rev 186798)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -30,10 +30,13 @@
</span><span class="cx"> #include "InbandTextTrackPrivateAVCF.h"
</span><span class="cx">
</span><span class="cx"> #include "FloatConversion.h"
</span><ins>+#include "ISOVTTCue.h"
</ins><span class="cx"> #include "InbandTextTrackPrivate.h"
</span><span class="cx"> #include "InbandTextTrackPrivateAVF.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "MediaTimeAVFoundation.h"
</ins><span class="cx"> #include "SoftLinking.h"
</span><ins>+#include <JavaScriptCore/ArrayBuffer.h>
</ins><span class="cx">
</span><span class="cx"> #include <AVFoundationCF/AVCFPlayerItemLegibleOutput.h>
</span><span class="cx"> #include <AVFoundationCF/AVFoundationCF.h>
</span><span class="lines">@@ -184,6 +187,29 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool InbandTextTrackPrivateAVCF::readNativeSampleBuffer(CFArrayRef nativeSamples, CFIndex index, RefPtr<ArrayBuffer>& buffer, MediaTime& duration, CMFormatDescriptionRef& formatDescription)
+{
+ const AVCFPlayerItemLegibleOutputSample* sampleBuffer = reinterpret_cast<const AVCFPlayerItemLegibleOutputSample*>(CFArrayGetValueAtIndex(nativeSamples, index));
+ if (!sampleBuffer)
+ return false;
+
+ duration = toMediaTime(sampleBuffer->duration);
+ formatDescription = sampleBuffer->formatDescription;
+
+ size_t bufferLength = CFDataGetLength(sampleBuffer->buffer);
+ if (bufferLength < ISOBox::boxHeaderSize()) {
+ LOG(Media, "InbandTextTrackPrivateLegacyAVCF::readNativeSampleBuffer(%p) - ERROR: CFBuffer size length unexpectedly small (%zu)!!", this, bufferLength);
+ return false;
+ }
+
+ m_sampleInputBuffer.resize(m_sampleInputBuffer.size() + bufferLength);
+ CFDataGetBytes(sampleBuffer->buffer, CFRangeMake(0, bufferLength), reinterpret_cast<UInt8*>(m_sampleInputBuffer.data()) + m_sampleInputBuffer.size() - bufferLength);
+
+ buffer = ArrayBuffer::create(m_sampleInputBuffer.data(), m_sampleInputBuffer.size());
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfInbandTextTrackPrivateAVCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h (186797 => 186798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h 2015-07-14 00:10:32 UTC (rev 186797)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.h 2015-07-14 01:11:12 UTC (rev 186798)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -55,7 +55,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void disconnect() override;
</span><span class="cx">
</span><del>- virtual Category textTrackCategory() const override { return InBand; }
</del><ins>+ Category textTrackCategory() const override { return InBand; }
+ bool readNativeSampleBuffer(CFArrayRef nativeSamples, CFIndex, RefPtr<JSC::ArrayBuffer>&, MediaTime&, CMFormatDescriptionRef&) override;
</ins><span class="cx">
</span><span class="cx"> AVCFMediaSelectionOptionRef mediaSelectionOption() const { return m_mediaSelectionOption.get(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (186797 => 186798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-07-14 00:10:32 UTC (rev 186797)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2015-07-14 01:11:12 UTC (rev 186798)
</span><span class="lines">@@ -1616,7 +1616,11 @@
</span><span class="cx"> AVCFPlayerItemOutputSetSuppressPlayerRendering(m_legibleOutput.get(), TRUE);
</span><span class="cx">
</span><span class="cx"> AVCFPlayerItemLegibleOutputCallbacks callbackInfo;
</span><ins>+#if HAVE(AVCFPLAYERITEM_CALLBACK_VERSION_2)
+ callbackInfo.version = kAVCFPlayerItemLegibleOutput_CallbacksVersion_2;
+#else
</ins><span class="cx"> callbackInfo.version = kAVCFPlayerItemLegibleOutput_CallbacksVersion_1;
</span><ins>+#endif
</ins><span class="cx"> ASSERT(callbackContext());
</span><span class="cx"> callbackInfo.context = callbackContext();
</span><span class="cx"> callbackInfo.legibleOutputCallback = AVFWrapper::legibleOutputCallback;
</span></span></pre>
</div>
</div>
</body>
</html>