<!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>[211978] 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/211978">211978</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2017-02-09 12:28:44 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make passing PlatformAudioData in audioSamplesAvaliable const-correct.
https://bugs.webkit.org/show_bug.cgi?id=168051
Reviewed by Eric Carlson.
Modify all the functions which take a (conceptually) read-only audio buffer const-correct.
Drive-by fix: AudioSampleBufferList::copyFrom() set a ivar pointer to the passed in
AudioBufferList. Ensure that the ivar is reset when copyFrom() returns by using a
SetForScope.
* platform/audio/mac/AudioSampleBufferList.cpp:
(WebCore::AudioSampleBufferList::copyFrom):
* platform/audio/mac/AudioSampleBufferList.h:
* platform/audio/mac/AudioSampleDataSource.cpp:
(WebCore::AudioSampleDataSource::pushSamplesInternal):
(WebCore::AudioSampleDataSource::pushSamples):
* platform/audio/mac/AudioSampleDataSource.h:
* platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::audioSamplesAvailable):
* platform/mediastream/RealtimeMediaSource.h:
(WebCore::RealtimeMediaSource::Observer::audioSamplesAvailable):
* platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp:
(WebCore::AudioTrackPrivateMediaStreamCocoa::audioSamplesAvailable):
* platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.h:
* platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp:
(WebCore::RealtimeOutgoingAudioSource::audioSamplesAvailable):
* platform/mediastream/mac/RealtimeOutgoingAudioSource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioSampleBufferListcpp">trunk/Source/WebCore/platform/audio/mac/AudioSampleBufferList.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioSampleBufferListh">trunk/Source/WebCore/platform/audio/mac/AudioSampleBufferList.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioSampleDataSourcecpp">trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacAudioSampleDataSourceh">trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAudioTrackPrivateMediaStreamCocoacpp">trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAudioTrackPrivateMediaStreamCocoah">trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourcecpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourceh">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/ChangeLog 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2017-02-09 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><ins>+ Make passing PlatformAudioData in audioSamplesAvaliable const-correct.
+ https://bugs.webkit.org/show_bug.cgi?id=168051
+
+ Reviewed by Eric Carlson.
+
+ Modify all the functions which take a (conceptually) read-only audio buffer const-correct.
+
+ Drive-by fix: AudioSampleBufferList::copyFrom() set a ivar pointer to the passed in
+ AudioBufferList. Ensure that the ivar is reset when copyFrom() returns by using a
+ SetForScope.
+
+ * platform/audio/mac/AudioSampleBufferList.cpp:
+ (WebCore::AudioSampleBufferList::copyFrom):
+ * platform/audio/mac/AudioSampleBufferList.h:
+ * platform/audio/mac/AudioSampleDataSource.cpp:
+ (WebCore::AudioSampleDataSource::pushSamplesInternal):
+ (WebCore::AudioSampleDataSource::pushSamples):
+ * platform/audio/mac/AudioSampleDataSource.h:
+ * platform/mediastream/RealtimeMediaSource.cpp:
+ (WebCore::RealtimeMediaSource::audioSamplesAvailable):
+ * platform/mediastream/RealtimeMediaSource.h:
+ (WebCore::RealtimeMediaSource::Observer::audioSamplesAvailable):
+ * platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp:
+ (WebCore::AudioTrackPrivateMediaStreamCocoa::audioSamplesAvailable):
+ * platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.h:
+ * platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp:
+ (WebCore::RealtimeOutgoingAudioSource::audioSamplesAvailable):
+ * platform/mediastream/mac/RealtimeOutgoingAudioSource.h:
+
+2017-02-09 Jer Noble <jer.noble@apple.com>
+
</ins><span class="cx"> Fix some logging statements in MediaPlayerPrivateMediaStreamAVFObjC
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168063
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioSampleBufferListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioSampleBufferList.cpp (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioSampleBufferList.cpp 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/audio/mac/AudioSampleBufferList.cpp 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "VectorMath.h"
</span><span class="cx"> #include <Accelerate/Accelerate.h>
</span><span class="cx"> #include <AudioToolbox/AudioConverter.h>
</span><ins>+#include <wtf/SetForScope.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -244,7 +245,7 @@
</span><span class="cx"> return static_cast<AudioSampleBufferList*>(inRefCon)->convertInput(ioNumberDataPackets, ioData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-OSStatus AudioSampleBufferList::copyFrom(AudioBufferList& source, AudioConverterRef converter)
</del><ins>+OSStatus AudioSampleBufferList::copyFrom(const AudioBufferList& source, AudioConverterRef converter)
</ins><span class="cx"> {
</span><span class="cx"> reset();
</span><span class="cx">
</span><span class="lines">@@ -252,7 +253,7 @@
</span><span class="cx"> UInt32 propertyDataSize = sizeof(inputFormat);
</span><span class="cx"> AudioConverterGetProperty(converter, kAudioConverterCurrentInputStreamDescription, &propertyDataSize, &inputFormat);
</span><span class="cx"> m_converterInputBytesPerPacket = inputFormat.mBytesPerPacket;
</span><del>- m_converterInputBuffer = &source;
</del><ins>+ SetForScope<const AudioBufferList*> scopedInputBuffer(m_converterInputBuffer, &source);
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> AudioStreamBasicDescription outputFormat;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioSampleBufferListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioSampleBufferList.h (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioSampleBufferList.h 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/audio/mac/AudioSampleBufferList.h 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> void applyGain(float);
</span><span class="cx">
</span><span class="cx"> OSStatus copyFrom(const AudioSampleBufferList&, size_t count = SIZE_MAX);
</span><del>- OSStatus copyFrom(AudioBufferList&, AudioConverterRef);
</del><ins>+ OSStatus copyFrom(const AudioBufferList&, AudioConverterRef);
</ins><span class="cx"> OSStatus copyFrom(AudioSampleBufferList&, AudioConverterRef);
</span><span class="cx"> OSStatus copyFrom(CARingBuffer&, size_t frameCount, uint64_t startFrame, CARingBuffer::FetchMode);
</span><span class="cx">
</span><span class="lines">@@ -83,8 +83,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CAAudioStreamDescription> m_internalFormat;
</span><span class="cx">
</span><del>- AudioSampleBufferList* m_converterInputBuffer2 { nullptr };
- AudioBufferList* m_converterInputBuffer { nullptr };
</del><ins>+ const AudioBufferList* m_converterInputBuffer { nullptr };
</ins><span class="cx"> uint32_t m_converterInputBytesPerPacket { 0 };
</span><span class="cx">
</span><span class="cx"> uint64_t m_timestamp { 0 };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioSampleDataSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.cpp (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.cpp 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.cpp 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -141,11 +141,11 @@
</span><span class="cx"> return MediaTime::createWithDouble(mach_absolute_time() * frequency);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AudioSampleDataSource::pushSamplesInternal(AudioBufferList& bufferList, const MediaTime& presentationTime, size_t sampleCount)
</del><ins>+void AudioSampleDataSource::pushSamplesInternal(const AudioBufferList& bufferList, const MediaTime& presentationTime, size_t sampleCount)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_lock.isHeld());
</span><span class="cx">
</span><del>- AudioBufferList* sampleBufferList;
</del><ins>+ const AudioBufferList* sampleBufferList;
</ins><span class="cx"> if (m_converter) {
</span><span class="cx"> m_scratchBuffer->reset();
</span><span class="cx"> OSStatus err = m_scratchBuffer->copyFrom(bufferList, m_converter);
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> pushSamplesInternal(list, toMediaTime(CMSampleBufferGetPresentationTimeStamp(sampleBuffer)), CMSampleBufferGetNumSamples(sampleBuffer));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AudioSampleDataSource::pushSamples(const MediaTime& sampleTime, PlatformAudioData& audioData, size_t sampleCount)
</del><ins>+void AudioSampleDataSource::pushSamples(const MediaTime& sampleTime, const PlatformAudioData& audioData, size_t sampleCount)
</ins><span class="cx"> {
</span><span class="cx"> std::unique_lock<Lock> lock(m_lock, std::try_to_lock);
</span><span class="cx"> ASSERT(is<WebAudioBufferList>(audioData));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacAudioSampleDataSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> OSStatus setInputFormat(const CAAudioStreamDescription&);
</span><span class="cx"> OSStatus setOutputFormat(const CAAudioStreamDescription&);
</span><span class="cx">
</span><del>- void pushSamples(const MediaTime&, PlatformAudioData&, size_t);
</del><ins>+ void pushSamples(const MediaTime&, const PlatformAudioData&, size_t);
</ins><span class="cx"> void pushSamples(const AudioStreamBasicDescription&, CMSampleBufferRef);
</span><span class="cx">
</span><span class="cx"> enum PullMode { Copy, Mix };
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> OSStatus setupConverter();
</span><span class="cx"> bool pullSamplesInternal(AudioBufferList&, size_t&, uint64_t, double, PullMode);
</span><span class="cx">
</span><del>- void pushSamplesInternal(AudioBufferList&, const MediaTime&, size_t frameCount);
</del><ins>+ void pushSamplesInternal(const AudioBufferList&, const MediaTime&, size_t frameCount);
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<CAAudioStreamDescription> m_inputDescription;
</span><span class="cx"> std::unique_ptr<CAAudioStreamDescription> m_outputDescription;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> observer->videoSampleAvailable(mediaSample);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RealtimeMediaSource::audioSamplesAvailable(const MediaTime& time, PlatformAudioData& audioData, const AudioStreamDescription& description, size_t numberOfFrames)
</del><ins>+void RealtimeMediaSource::audioSamplesAvailable(const MediaTime& time, const PlatformAudioData& audioData, const AudioStreamDescription& description, size_t numberOfFrames)
</ins><span class="cx"> {
</span><span class="cx"> for (const auto& observer : m_observers)
</span><span class="cx"> observer->audioSamplesAvailable(time, audioData, description, numberOfFrames);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> virtual void videoSampleAvailable(MediaSample&) { }
</span><span class="cx">
</span><span class="cx"> // May be called on a background thread.
</span><del>- virtual void audioSamplesAvailable(const MediaTime&, PlatformAudioData&, const AudioStreamDescription&, size_t /*numberOfFrames*/) { }
</del><ins>+ virtual void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t /*numberOfFrames*/) { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> virtual ~RealtimeMediaSource() { }
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> virtual void settingsDidChange();
</span><span class="cx">
</span><span class="cx"> void videoSampleAvailable(MediaSample&);
</span><del>- void audioSamplesAvailable(const MediaTime&, PlatformAudioData&, const AudioStreamDescription&, size_t);
</del><ins>+ void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t);
</ins><span class="cx">
</span><span class="cx"> bool stopped() const { return m_stopped; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAudioTrackPrivateMediaStreamCocoacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> return err;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AudioTrackPrivateMediaStreamCocoa::audioSamplesAvailable(const MediaTime& sampleTime, PlatformAudioData& audioData, const AudioStreamDescription& description, size_t sampleCount)
</del><ins>+void AudioTrackPrivateMediaStreamCocoa::audioSamplesAvailable(const MediaTime& sampleTime, const PlatformAudioData& audioData, const AudioStreamDescription& description, size_t sampleCount)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(description.platformDescription().type == PlatformDescription::CAAudioStreamBasicType);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAudioTrackPrivateMediaStreamCocoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.h (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.h 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.h 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> void sourceMutedChanged() final { }
</span><span class="cx"> void sourceSettingsChanged() final { }
</span><span class="cx"> bool preventSourceFromStopping() final { return false; }
</span><del>- void audioSamplesAvailable(const MediaTime&, PlatformAudioData&, const AudioStreamDescription&, size_t) final;
</del><ins>+ void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t) final;
</ins><span class="cx">
</span><span class="cx"> static OSStatus inputProc(void*, AudioUnitRenderActionFlags*, const AudioTimeStamp*, UInt32 inBusNumber, UInt32 numberOfFrames, AudioBufferList*);
</span><span class="cx"> OSStatus render(UInt32 sampleCount, AudioBufferList&, UInt32 inBusNumber, const AudioTimeStamp&, AudioUnitRenderActionFlags&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void RealtimeOutgoingAudioSource::audioSamplesAvailable(const MediaTime&, PlatformAudioData&, const AudioStreamDescription&, size_t)
</del><ins>+void RealtimeOutgoingAudioSource::audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h (211977 => 211978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h 2017-02-09 20:22:31 UTC (rev 211977)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h 2017-02-09 20:28:44 UTC (rev 211978)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> void sourceMutedChanged() final { }
</span><span class="cx"> void sourceSettingsChanged() final { }
</span><span class="cx"> bool preventSourceFromStopping() final { return false; }
</span><del>- void audioSamplesAvailable(const MediaTime&, PlatformAudioData&, const AudioStreamDescription&, size_t) final;
</del><ins>+ void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t) final;
</ins><span class="cx">
</span><span class="cx"> void convertAndSendMonoSamples();
</span><span class="cx"> void convertAndSendStereoSamples();
</span></span></pre>
</div>
</div>
</body>
</html>