| Index: third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
|
| index 573270f3608f3a03b10f6c91551f9fc2394727bb..3f0c77120a36c2e7f3009f7e681ee441c6d83ed2 100644
|
| --- a/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
|
| +++ b/third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
|
| @@ -23,8 +23,8 @@
|
| */
|
|
|
| #include "modules/webaudio/MediaStreamAudioSourceNode.h"
|
| -#include "modules/webaudio/AbstractAudioContext.h"
|
| #include "modules/webaudio/AudioNodeOutput.h"
|
| +#include "modules/webaudio/BaseAudioContext.h"
|
| #include "platform/Logging.h"
|
| #include "wtf/Locker.h"
|
|
|
| @@ -58,7 +58,7 @@ void MediaStreamAudioSourceHandler::setFormat(size_t numberOfChannels, float sou
|
| {
|
| if (numberOfChannels != m_sourceNumberOfChannels || sourceSampleRate != sampleRate()) {
|
| // The sample-rate must be equal to the context's sample-rate.
|
| - if (!numberOfChannels || numberOfChannels > AbstractAudioContext::maxNumberOfChannels() || sourceSampleRate != sampleRate()) {
|
| + if (!numberOfChannels || numberOfChannels > BaseAudioContext::maxNumberOfChannels() || sourceSampleRate != sampleRate()) {
|
| // process() will generate silence for these uninitialized values.
|
| WTF_LOG(Media, "MediaStreamAudioSourceNode::setFormat(%u, %f) - unhandled format change", static_cast<unsigned>(numberOfChannels), sourceSampleRate);
|
| m_sourceNumberOfChannels = 0;
|
| @@ -72,7 +72,7 @@ void MediaStreamAudioSourceHandler::setFormat(size_t numberOfChannels, float sou
|
|
|
| {
|
| // The context must be locked when changing the number of output channels.
|
| - AbstractAudioContext::AutoLocker contextLocker(context());
|
| + BaseAudioContext::AutoLocker contextLocker(context());
|
|
|
| // Do any necesssary re-configuration to the output's number of channels.
|
| output(0).setNumberOfChannels(numberOfChannels);
|
| @@ -108,13 +108,13 @@ void MediaStreamAudioSourceHandler::process(size_t numberOfFrames)
|
|
|
| // ----------------------------------------------------------------
|
|
|
| -MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AbstractAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
|
| +MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(BaseAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
|
| : AudioSourceNode(context)
|
| {
|
| setHandler(MediaStreamAudioSourceHandler::create(*this, mediaStream, audioTrack, audioSourceProvider));
|
| }
|
|
|
| -MediaStreamAudioSourceNode* MediaStreamAudioSourceNode::create(AbstractAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
|
| +MediaStreamAudioSourceNode* MediaStreamAudioSourceNode::create(BaseAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
|
| {
|
| return new MediaStreamAudioSourceNode(context, mediaStream, audioTrack, audioSourceProvider);
|
| }
|
|
|