[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
crogers at google.com
crogers at google.com
Wed Dec 22 14:13:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 06dd1084747edab334e81409c1e10463f2d05002
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 5 18:48:42 2010 +0000
2010-10-05 Chris Rogers <crogers at google.com>
Reviewed by Kenneth Russell.
Add AudioBasicProcessorNode files
https://bugs.webkit.org/show_bug.cgi?id=46495
No new tests since audio API is not yet implemented.
* webaudio/AudioBasicProcessorNode.cpp: Added.
(WebCore::AudioBasicProcessorNode::AudioBasicProcessorNode):
(WebCore::AudioBasicProcessorNode::initialize):
(WebCore::AudioBasicProcessorNode::uninitialize):
(WebCore::AudioBasicProcessorNode::process):
(WebCore::AudioBasicProcessorNode::pullInputs):
(WebCore::AudioBasicProcessorNode::reset):
(WebCore::AudioBasicProcessorNode::checkNumberOfChannelsForInput):
(WebCore::AudioBasicProcessorNode::numberOfChannels):
* webaudio/AudioBasicProcessorNode.h: Added.
(WebCore::AudioBasicProcessorNode::processor):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69131 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bdf19b4..d540719 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-10-05 Chris Rogers <crogers at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Add AudioBasicProcessorNode files
+ https://bugs.webkit.org/show_bug.cgi?id=46495
+
+ No new tests since audio API is not yet implemented.
+
+ * webaudio/AudioBasicProcessorNode.cpp: Added.
+ (WebCore::AudioBasicProcessorNode::AudioBasicProcessorNode):
+ (WebCore::AudioBasicProcessorNode::initialize):
+ (WebCore::AudioBasicProcessorNode::uninitialize):
+ (WebCore::AudioBasicProcessorNode::process):
+ (WebCore::AudioBasicProcessorNode::pullInputs):
+ (WebCore::AudioBasicProcessorNode::reset):
+ (WebCore::AudioBasicProcessorNode::checkNumberOfChannelsForInput):
+ (WebCore::AudioBasicProcessorNode::numberOfChannels):
+ * webaudio/AudioBasicProcessorNode.h: Added.
+ (WebCore::AudioBasicProcessorNode::processor):
+
2010-10-05 Chris Marrin <cmarrin at apple.com>
Unreviewed.
diff --git a/WebCore/webaudio/AudioBasicProcessorNode.cpp b/WebCore/webaudio/AudioBasicProcessorNode.cpp
new file mode 100644
index 0000000..cadaa73
--- /dev/null
+++ b/WebCore/webaudio/AudioBasicProcessorNode.cpp
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2010, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if ENABLE(WEB_AUDIO)
+
+#include "AudioBasicProcessorNode.h"
+
+#include "AudioBus.h"
+#include "AudioNodeInput.h"
+#include "AudioNodeOutput.h"
+#include "AudioProcessor.h"
+
+namespace WebCore {
+
+AudioBasicProcessorNode::AudioBasicProcessorNode(AudioContext* context, double sampleRate)
+ : AudioNode(context, sampleRate)
+{
+ addInput(adoptPtr(new AudioNodeInput(this)));
+ addOutput(adoptPtr(new AudioNodeOutput(this, 0)));
+
+ // The subclass must create m_processor.
+}
+
+void AudioBasicProcessorNode::initialize()
+{
+ if (isInitialized())
+ return;
+
+ ASSERT(processor());
+ processor()->initialize();
+
+ AudioNode::initialize();
+}
+
+void AudioBasicProcessorNode::uninitialize()
+{
+ if (!isInitialized())
+ return;
+
+ ASSERT(processor());
+ processor()->uninitialize();
+
+ AudioNode::uninitialize();
+}
+
+void AudioBasicProcessorNode::process(size_t framesToProcess)
+{
+ AudioBus* destinationBus = output(0)->bus();
+
+ // The realtime thread can't block on this lock, so we call tryLock() instead.
+ if (m_processLock.tryLock()) {
+ if (!isInitialized() || !processor())
+ destinationBus->zero();
+ else {
+ AudioBus* sourceBus = input(0)->bus();
+
+ // FIXME: if we take "tail time" into account, then we can avoid calling processor()->process() once the tail dies down.
+ if (!input(0)->isConnected())
+ sourceBus->zero();
+
+ processor()->process(sourceBus, destinationBus, framesToProcess);
+ }
+
+ m_processLock.unlock();
+ } else {
+ // Too bad - the tryLock() failed. We must be in the middle of re-connecting and were already outputting silence anyway...
+ destinationBus->zero();
+ }
+}
+
+// Nice optimization in the very common case allowing for "in-place" processing
+void AudioBasicProcessorNode::pullInputs(size_t framesToProcess)
+{
+ // Render input stream - suggest to the input to render directly into output bus for in-place processing in process() if possible.
+ input(0)->pull(output(0)->bus(), framesToProcess);
+}
+
+void AudioBasicProcessorNode::reset()
+{
+ if (processor())
+ processor()->reset();
+}
+
+// As soon as we know the channel count of our input, we can lazily initialize.
+// Sometimes this may be called more than once with different channel counts, in which case we must safely
+// uninitialize and then re-initialize with the new channel count.
+void AudioBasicProcessorNode::checkNumberOfChannelsForInput(AudioNodeInput* input)
+{
+ ASSERT(isMainThread());
+
+ ASSERT(input == this->input(0));
+ if (input != this->input(0))
+ return;
+
+ ASSERT(processor());
+ if (!processor())
+ return;
+
+ unsigned numberOfChannels = input->numberOfChannels();
+
+ if (isInitialized() && numberOfChannels != output(0)->numberOfChannels()) {
+ // We're already initialized but the channel count has changed.
+ // We need to be careful since we may be actively processing right now, so synchronize with process().
+ MutexLocker locker(m_processLock);
+ uninitialize();
+ }
+
+ // This will propagate the channel count to any nodes connected further down the chain...
+ output(0)->setNumberOfChannels(numberOfChannels);
+
+ // Re-initialize the processor with the new channel count.
+ processor()->setNumberOfChannels(numberOfChannels);
+ initialize();
+}
+
+unsigned AudioBasicProcessorNode::numberOfChannels()
+{
+ return output(0)->numberOfChannels();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)
diff --git a/WebCore/webaudio/AudioBasicProcessorNode.h b/WebCore/webaudio/AudioBasicProcessorNode.h
new file mode 100644
index 0000000..38bfd3b
--- /dev/null
+++ b/WebCore/webaudio/AudioBasicProcessorNode.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2010, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AudioBasicProcessorNode_h
+#define AudioBasicProcessorNode_h
+
+#include "AudioNode.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/Threading.h>
+
+namespace WebCore {
+
+class AudioBus;
+class AudioNodeInput;
+class AudioProcessor;
+
+// AudioBasicProcessorNode is an AudioNode with one input and one output where the input and output have the same number of channels.
+class AudioBasicProcessorNode : public AudioNode {
+public:
+ AudioBasicProcessorNode(AudioContext*, double sampleRate);
+
+ // AudioNode
+ virtual void process(size_t framesToProcess);
+ virtual void pullInputs(size_t framesToProcess);
+ virtual void reset();
+ virtual void initialize();
+ virtual void uninitialize();
+
+ // Called in the main thread when the number of channels for the input may have changed.
+ virtual void checkNumberOfChannelsForInput(AudioNodeInput*);
+
+ // Returns the number of channels for both the input and the output.
+ unsigned numberOfChannels();
+
+protected:
+ AudioProcessor* processor() { return m_processor.get(); }
+ OwnPtr<AudioProcessor> m_processor;
+
+private:
+ // This synchronizes live channel count changes which require an uninitialization / re-initialization.
+ mutable Mutex m_processLock;
+};
+
+} // namespace WebCore
+
+#endif // AudioBasicProcessorNode_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list