2010-09-09 Chris Rogers <crogers@google.com>
authorcrogers@google.com <crogers@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Sep 2010 22:48:07 +0000 (22:48 +0000)
committercrogers@google.com <crogers@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 9 Sep 2010 22:48:07 +0000 (22:48 +0000)
        Reviewed by Kenneth Russell.

        Add AudioDSPKernelProcessor files
        https://bugs.webkit.org/show_bug.cgi?id=45211

        No new tests since audio API is not yet implemented.

        * platform/audio/AudioDSPKernelProcessor.cpp: Added.
        (WebCore::AudioDSPKernelProcessor::AudioDSPKernelProcessor):
        (WebCore::AudioDSPKernelProcessor::initialize):
        (WebCore::AudioDSPKernelProcessor::uninitialize):
        (WebCore::AudioDSPKernelProcessor::process):
        (WebCore::AudioDSPKernelProcessor::reset):
        (WebCore::AudioDSPKernelProcessor::setNumberOfChannels):
        * platform/audio/AudioDSPKernelProcessor.h: Added.
        (WebCore::AudioDSPKernelProcessor::numberOfChannels):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@67121 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/audio/AudioDSPKernelProcessor.cpp [new file with mode: 0644]
WebCore/platform/audio/AudioDSPKernelProcessor.h [new file with mode: 0644]

index a56195289ba2c38284e40e43406492a7e7424601..6837b60d5a3621f8c0f2c355b7a0c7374d80d965 100644 (file)
@@ -1,3 +1,22 @@
+2010-09-09  Chris Rogers  <crogers@google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Add AudioDSPKernelProcessor files
+        https://bugs.webkit.org/show_bug.cgi?id=45211
+
+        No new tests since audio API is not yet implemented.
+
+        * platform/audio/AudioDSPKernelProcessor.cpp: Added.
+        (WebCore::AudioDSPKernelProcessor::AudioDSPKernelProcessor):
+        (WebCore::AudioDSPKernelProcessor::initialize):
+        (WebCore::AudioDSPKernelProcessor::uninitialize):
+        (WebCore::AudioDSPKernelProcessor::process):
+        (WebCore::AudioDSPKernelProcessor::reset):
+        (WebCore::AudioDSPKernelProcessor::setNumberOfChannels):
+        * platform/audio/AudioDSPKernelProcessor.h: Added.
+        (WebCore::AudioDSPKernelProcessor::numberOfChannels):
+
 2010-09-09  Chris Rogers  <crogers@google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/audio/AudioDSPKernelProcessor.cpp b/WebCore/platform/audio/AudioDSPKernelProcessor.cpp
new file mode 100644 (file)
index 0000000..d79afd5
--- /dev/null
@@ -0,0 +1,116 @@
+/*
+ * 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:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * 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.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER OR 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 "AudioDSPKernelProcessor.h"
+
+#include "AudioDSPKernel.h"
+
+namespace WebCore {
+
+// setNumberOfChannels() may later be called if the object is not yet in an "initialized" state.
+AudioDSPKernelProcessor::AudioDSPKernelProcessor(double sampleRate, unsigned numberOfChannels)
+    : AudioProcessor(sampleRate)
+    , m_numberOfChannels(numberOfChannels)
+    , m_hasJustReset(true)
+{
+}
+
+void AudioDSPKernelProcessor::initialize()
+{
+    if (isInitialized())
+        return;
+
+    ASSERT(!m_kernels.size());
+
+    // Create processing kernels, one per channel.
+    for (unsigned i = 0; i < numberOfChannels(); ++i)
+        m_kernels.append(createKernel());
+
+    m_initialized = true;
+}
+
+void AudioDSPKernelProcessor::uninitialize()
+{
+    if (!isInitialized())
+        return;
+        
+    m_kernels.clear();
+
+    m_initialized = false;
+}
+
+void AudioDSPKernelProcessor::process(AudioBus* source, AudioBus* destination, size_t framesToProcess)
+{
+    ASSERT(source && destination);
+    if (!source || !destination)
+        return;
+        
+    if (!isInitialized()) {
+        destination->zero();
+        return;
+    }
+
+    bool channelCountMatches = source->numberOfChannels() == destination->numberOfChannels() && source->numberOfChannels() == m_kernels.size();
+    ASSERT(channelCountMatches);
+    if (!channelCountMatches)
+        return;
+        
+    for (unsigned i = 0; i < m_kernels.size(); ++i)
+        m_kernels[i]->process(source->channel(i)->data(), destination->channel(i)->data(), framesToProcess);
+}
+
+// Resets filter state
+void AudioDSPKernelProcessor::reset()
+{
+    if (!isInitialized())
+        return;
+
+    // Forces snap to parameter values - first time.
+    // Any processing depending on this value must set it to false at the appropriate time.
+    m_hasJustReset = true;
+
+    for (unsigned i = 0; i < m_kernels.size(); ++i)
+        m_kernels[i]->reset();
+}
+
+void AudioDSPKernelProcessor::setNumberOfChannels(unsigned numberOfChannels)
+{
+    ASSERT(!isInitialized());
+    if (!isInitialized())
+        m_numberOfChannels = numberOfChannels;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)
diff --git a/WebCore/platform/audio/AudioDSPKernelProcessor.h b/WebCore/platform/audio/AudioDSPKernelProcessor.h
new file mode 100644 (file)
index 0000000..e87a810
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * 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:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * 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.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
+ * OWNER OR 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 AudioDSPKernelProcessor_h
+#define AudioDSPKernelProcessor_h
+
+#include "AudioBus.h"
+#include "AudioProcessor.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+class AudioBus;
+class AudioDSPKernel;
+class AudioProcessor;
+
+// AudioDSPKernelProcessor processes one input -> one output (N channels each)
+// It uses one AudioDSPKernel object per channel to do the processing, thus there is no cross-channel processing.
+// Despite this limitation it turns out to be a very common and useful type of processor.
+
+class AudioDSPKernelProcessor : public AudioProcessor {
+public:
+    // numberOfChannels may be later changed if object is not yet in an "initialized" state
+    AudioDSPKernelProcessor(double sampleRate, unsigned numberOfChannels);
+
+    // Subclasses create the appropriate type of processing kernel here.
+    // We'll call this to create a kernel for each channel.
+    virtual PassOwnPtr<AudioDSPKernel> createKernel() = 0;
+
+    // AudioProcessor methods
+    virtual void initialize();
+    virtual void uninitialize();
+    virtual void process(AudioBus* source, AudioBus* destination, size_t framesToProcess);
+    virtual void reset();
+    virtual void setNumberOfChannels(unsigned numberOfChannels);
+
+    unsigned numberOfChannels() const { return m_numberOfChannels; }
+
+protected:
+    unsigned m_numberOfChannels;
+    Vector<OwnPtr<AudioDSPKernel> > m_kernels;
+    bool m_hasJustReset;
+};
+
+} // namespace WebCore
+
+#endif // AudioDSPKernelProcessor_h