Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: Source/modules/webaudio/MediaStreamAudioSourceNode.cpp

Issue 1214463003: Split "Online" and "Offline" AudioContext processing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Bring to ToT Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/webaudio/MediaStreamAudioSourceNode.h ('k') | Source/modules/webaudio/OfflineAudioContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
diff --git a/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp b/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
index 63dab9d60f753d521366173157da22ea2729ced8..9105810c6868bfdb6012d8ef7eb217a040b77293 100644
--- a/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
+++ b/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp
@@ -26,7 +26,7 @@
#if ENABLE(WEB_AUDIO)
#include "modules/webaudio/MediaStreamAudioSourceNode.h"
-#include "modules/webaudio/AudioContext.h"
+#include "modules/webaudio/AbstractAudioContext.h"
#include "modules/webaudio/AudioNodeOutput.h"
#include "platform/Logging.h"
#include "wtf/Locker.h"
@@ -61,7 +61,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 > AudioContext::maxNumberOfChannels() || sourceSampleRate != sampleRate()) {
+ if (!numberOfChannels || numberOfChannels > AbstractAudioContext::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;
@@ -75,7 +75,7 @@ void MediaStreamAudioSourceHandler::setFormat(size_t numberOfChannels, float sou
{
// The context must be locked when changing the number of output channels.
- AudioContext::AutoLocker contextLocker(context());
+ AbstractAudioContext::AutoLocker contextLocker(context());
// Do any necesssary re-configuration to the output's number of channels.
output(0).setNumberOfChannels(numberOfChannels);
@@ -111,13 +111,13 @@ void MediaStreamAudioSourceHandler::process(size_t numberOfFrames)
// ----------------------------------------------------------------
-MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
+MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AbstractAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
: AudioSourceNode(context)
{
setHandler(MediaStreamAudioSourceHandler::create(*this, mediaStream, audioTrack, audioSourceProvider));
}
-MediaStreamAudioSourceNode* MediaStreamAudioSourceNode::create(AudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
+MediaStreamAudioSourceNode* MediaStreamAudioSourceNode::create(AbstractAudioContext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProvider> audioSourceProvider)
{
return new MediaStreamAudioSourceNode(context, mediaStream, audioTrack, audioSourceProvider);
}
« no previous file with comments | « Source/modules/webaudio/MediaStreamAudioSourceNode.h ('k') | Source/modules/webaudio/OfflineAudioContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698