[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 15:24:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 81edfb1ce821a95d4bb2d16ba59ecabf2f32a8db
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 2 20:53:33 2010 +0000
2010-11-02 Chris Rogers <crogers at google.com>
Reviewed by Kenneth Russell.
Add RealtimeAnalyserNode files
https://bugs.webkit.org/show_bug.cgi?id=48798
No new tests since audio API is not yet implemented.
* webaudio/RealtimeAnalyserNode.cpp: Added.
(WebCore::RealtimeAnalyserNode::RealtimeAnalyserNode):
(WebCore::RealtimeAnalyserNode::~RealtimeAnalyserNode):
(WebCore::RealtimeAnalyserNode::process):
(WebCore::RealtimeAnalyserNode::pullInputs):
(WebCore::RealtimeAnalyserNode::reset):
* webaudio/RealtimeAnalyserNode.h: Added.
(WebCore::RealtimeAnalyserNode::create):
(WebCore::RealtimeAnalyserNode::fftSize):
(WebCore::RealtimeAnalyserNode::setFftSize):
(WebCore::RealtimeAnalyserNode::frequencyBinCount):
(WebCore::RealtimeAnalyserNode::setMinDecibels):
(WebCore::RealtimeAnalyserNode::minDecibels):
(WebCore::RealtimeAnalyserNode::setMaxDecibels):
(WebCore::RealtimeAnalyserNode::maxDecibels):
(WebCore::RealtimeAnalyserNode::setSmoothingTimeConstant):
(WebCore::RealtimeAnalyserNode::smoothingTimeConstant):
(WebCore::RealtimeAnalyserNode::getFloatFrequencyData):
(WebCore::RealtimeAnalyserNode::getByteFrequencyData):
(WebCore::RealtimeAnalyserNode::getByteTimeDomainData):
* webaudio/RealtimeAnalyserNode.idl: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71163 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 74a300e..bf7321d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2010-11-02 Chris Rogers <crogers at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Add RealtimeAnalyserNode files
+ https://bugs.webkit.org/show_bug.cgi?id=48798
+
+ No new tests since audio API is not yet implemented.
+
+ * webaudio/RealtimeAnalyserNode.cpp: Added.
+ (WebCore::RealtimeAnalyserNode::RealtimeAnalyserNode):
+ (WebCore::RealtimeAnalyserNode::~RealtimeAnalyserNode):
+ (WebCore::RealtimeAnalyserNode::process):
+ (WebCore::RealtimeAnalyserNode::pullInputs):
+ (WebCore::RealtimeAnalyserNode::reset):
+ * webaudio/RealtimeAnalyserNode.h: Added.
+ (WebCore::RealtimeAnalyserNode::create):
+ (WebCore::RealtimeAnalyserNode::fftSize):
+ (WebCore::RealtimeAnalyserNode::setFftSize):
+ (WebCore::RealtimeAnalyserNode::frequencyBinCount):
+ (WebCore::RealtimeAnalyserNode::setMinDecibels):
+ (WebCore::RealtimeAnalyserNode::minDecibels):
+ (WebCore::RealtimeAnalyserNode::setMaxDecibels):
+ (WebCore::RealtimeAnalyserNode::maxDecibels):
+ (WebCore::RealtimeAnalyserNode::setSmoothingTimeConstant):
+ (WebCore::RealtimeAnalyserNode::smoothingTimeConstant):
+ (WebCore::RealtimeAnalyserNode::getFloatFrequencyData):
+ (WebCore::RealtimeAnalyserNode::getByteFrequencyData):
+ (WebCore::RealtimeAnalyserNode::getByteTimeDomainData):
+ * webaudio/RealtimeAnalyserNode.idl: Added.
+
2010-11-02 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r71152.
diff --git a/WebCore/webaudio/RealtimeAnalyserNode.cpp b/WebCore/webaudio/RealtimeAnalyserNode.cpp
new file mode 100644
index 0000000..2ba751a
--- /dev/null
+++ b/WebCore/webaudio/RealtimeAnalyserNode.cpp
@@ -0,0 +1,88 @@
+/*
+ * 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 "RealtimeAnalyserNode.h"
+
+#include "AudioNodeInput.h"
+#include "AudioNodeOutput.h"
+
+namespace WebCore {
+
+RealtimeAnalyserNode::RealtimeAnalyserNode(AudioContext* context, double sampleRate)
+ : AudioNode(context, sampleRate)
+{
+ addInput(adoptPtr(new AudioNodeInput(this)));
+ addOutput(adoptPtr(new AudioNodeOutput(this, 2)));
+
+ setType(NodeTypeAnalyser);
+
+ initialize();
+}
+
+RealtimeAnalyserNode::~RealtimeAnalyserNode()
+{
+ uninitialize();
+}
+
+void RealtimeAnalyserNode::process(size_t framesToProcess)
+{
+ AudioBus* outputBus = output(0)->bus();
+
+ if (!isInitialized() || !input(0)->isConnected()) {
+ outputBus->zero();
+ return;
+ }
+
+ AudioBus* inputBus = input(0)->bus();
+
+ // Give the analyser the audio which is passing through this AudioNode.
+ m_analyser.writeInput(inputBus, framesToProcess);
+
+ // For in-place processing, our override of pullInputs() will just pass the audio data through unchanged if the channel count matches from input to output
+ // (resulting in inputBus == outputBus). Otherwise, do an up-mix to stereo.
+ if (inputBus != outputBus)
+ outputBus->copyFrom(*inputBus);
+}
+
+// We override pullInputs() as an optimization allowing this node to take advantage of in-place processing,
+// where the input is simply passed through unprocessed to the output.
+// Note: this only applies if the input and output channel counts match.
+void RealtimeAnalyserNode::pullInputs(size_t framesToProcess)
+{
+ // Render input stream - try to render directly into output bus for pass-through processing where process() doesn't need to do anything...
+ input(0)->pull(output(0)->bus(), framesToProcess);
+}
+
+void RealtimeAnalyserNode::reset()
+{
+ m_analyser.reset();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_AUDIO)
diff --git a/WebCore/webaudio/RealtimeAnalyserNode.h b/WebCore/webaudio/RealtimeAnalyserNode.h
new file mode 100644
index 0000000..9f62464
--- /dev/null
+++ b/WebCore/webaudio/RealtimeAnalyserNode.h
@@ -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:
+ * 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 RealtimeAnalyserNode_h
+#define RealtimeAnalyserNode_h
+
+#include "AudioNode.h"
+#include "RealtimeAnalyser.h"
+
+namespace WebCore {
+
+class RealtimeAnalyserNode : public AudioNode {
+public:
+ static PassRefPtr<RealtimeAnalyserNode> create(AudioContext* context, double sampleRate)
+ {
+ return adoptRef(new RealtimeAnalyserNode(context, sampleRate));
+ }
+
+ virtual ~RealtimeAnalyserNode();
+
+ // AudioNode
+ virtual void process(size_t framesToProcess);
+ virtual void pullInputs(size_t framesToProcess);
+ virtual void reset();
+
+ // Javascript bindings
+ unsigned int fftSize() const { return m_analyser.fftSize(); }
+ void setFftSize(unsigned int size) { m_analyser.setFftSize(size); }
+
+ unsigned frequencyBinCount() const { return m_analyser.frequencyBinCount(); }
+
+ void setMinDecibels(float k) { m_analyser.setMinDecibels(k); }
+ float minDecibels() const { return m_analyser.minDecibels(); }
+
+ void setMaxDecibels(float k) { m_analyser.setMaxDecibels(k); }
+ float maxDecibels() const { return m_analyser.maxDecibels(); }
+
+ void setSmoothingTimeConstant(float k) { m_analyser.setSmoothingTimeConstant(k); }
+ float smoothingTimeConstant() const { return m_analyser.smoothingTimeConstant(); }
+
+#if ENABLE(3D_CANVAS)
+ void getFloatFrequencyData(Float32Array* array) { m_analyser.getFloatFrequencyData(array); }
+ void getByteFrequencyData(Uint8Array* array) { m_analyser.getByteFrequencyData(array); }
+ void getByteTimeDomainData(Uint8Array* array) { m_analyser.getByteTimeDomainData(array); }
+#endif
+
+private:
+ RealtimeAnalyserNode(AudioContext*, double sampleRate);
+
+ RealtimeAnalyser m_analyser;
+};
+
+} // namespace WebCore
+
+#endif // RealtimeAnalyserNode_h
diff --git a/WebCore/webaudio/RealtimeAnalyserNode.idl b/WebCore/webaudio/RealtimeAnalyserNode.idl
new file mode 100644
index 0000000..5b2b223
--- /dev/null
+++ b/WebCore/webaudio/RealtimeAnalyserNode.idl
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+module audio {
+ interface [
+ Conditional=WEB_AUDIO,
+ GenerateToJS
+ ] RealtimeAnalyserNode : AudioNode {
+ attribute unsigned long fftSize;
+ readonly attribute unsigned long frequencyBinCount;
+
+ // minDecibels / maxDecibels represent the range to scale the FFT analysis data for conversion to unsigned byte values.
+ attribute float minDecibels;
+ attribute float maxDecibels;
+
+ // A value from 0.0 -> 1.0 where 0.0 represents no time averaging with the last analysis frame.
+ attribute float smoothingTimeConstant;
+
+ // Copies the current frequency data into the passed array.
+ // If the array has fewer elements than the frequencyBinCount, the excess elements will be dropped.
+ [Conditional=3D_CANVAS] void getFloatFrequencyData(in Float32Array array);
+ [Conditional=3D_CANVAS] void getByteFrequencyData(in Uint8Array array);
+
+ // Real-time waveform data
+ [Conditional=3D_CANVAS] void getByteTimeDomainData(in Uint8Array array);
+ };
+}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list