Add exception for the setter of "fftSize" in RealtimeAnalyserNode

https://bugs.webkit.org/show_bug.cgi?id=81748

Patch by Xingnan Wang <xingnan.wang@intel.com> on 2012-03-22
Reviewed by Chris Rogers.

Source/WebCore:

* Modules/webaudio/RealtimeAnalyser.cpp:
(WebCore::RealtimeAnalyser::setFftSize):
* Modules/webaudio/RealtimeAnalyser.h:
(RealtimeAnalyser):
* Modules/webaudio/RealtimeAnalyserNode.cpp:
(WebCore::RealtimeAnalyserNode::setFftSize):
(WebCore):
* Modules/webaudio/RealtimeAnalyserNode.h:
(RealtimeAnalyserNode):
* Modules/webaudio/RealtimeAnalyserNode.idl:

LayoutTests:

* webaudio/realtimeanalyser-fft-sizing-expected.txt:
* webaudio/realtimeanalyser-fft-sizing.html:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4d8a8fc..da08a51 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-22  Xingnan Wang  <xingnan.wang@intel.com>
+
+        Add exception for the setter of "fftSize" in RealtimeAnalyserNode
+        https://bugs.webkit.org/show_bug.cgi?id=81748
+
+        Reviewed by Chris Rogers.
+
+        * webaudio/realtimeanalyser-fft-sizing-expected.txt:
+        * webaudio/realtimeanalyser-fft-sizing.html:
+
 2012-03-22  Emil A Eklund  <eae@chromium.org>
 
         Unreviewed rebaseline of chrome-win table tests post r111742.

diff --git a/LayoutTests/webaudio/realtimeanalyser-fft-sizing-expected.txt b/LayoutTests/webaudio/realtimeanalyser-fft-sizing-expected.txt
index 4b0ea60..9da5350 100644 (file)
--- a/LayoutTests/webaudio/realtimeanalyser-fft-sizing-expected.txt
+++ b/LayoutTests/webaudio/realtimeanalyser-fft-sizing-expected.txt
@@ -2,6 +2,43 @@ Test that re-sizing the FFT arrays does not fail.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
+PASS Exception thrown for illegal fftSize -1.
+PASS Exception thrown for illegal fftSize 0.
+PASS Exception thrown for illegal fftSize 1.
+PASS Exception thrown for illegal fftSize 2.
+PASS Exception thrown for illegal fftSize 3.
+PASS Exception thrown for illegal fftSize 4.
+PASS Exception thrown for illegal fftSize 5.
+PASS Exception thrown for illegal fftSize 8.
+PASS Exception thrown for illegal fftSize 9.
+PASS Exception thrown for illegal fftSize 16.
+PASS Exception thrown for illegal fftSize 17.
+PASS Exception thrown for illegal fftSize 32.
+PASS Exception thrown for illegal fftSize 33.
+PASS Exception thrown for illegal fftSize 64.
+PASS Exception thrown for illegal fftSize 65.
+PASS Successfully set legal fftSize 128.
+PASS Exception thrown for illegal fftSize 129.
+PASS Successfully set legal fftSize 256.
+PASS Exception thrown for illegal fftSize 257.
+PASS Successfully set legal fftSize 512.
+PASS Exception thrown for illegal fftSize 513.
+PASS Successfully set legal fftSize 1024.
+PASS Exception thrown for illegal fftSize 1025.
+PASS Successfully set legal fftSize 2048.
+PASS Exception thrown for illegal fftSize 2049.
+PASS Exception thrown for illegal fftSize 4096.
+PASS Exception thrown for illegal fftSize 4097.
+PASS Exception thrown for illegal fftSize 8192.
+PASS Exception thrown for illegal fftSize 8193.
+PASS Exception thrown for illegal fftSize 16384.
+PASS Exception thrown for illegal fftSize 16385.
+PASS Exception thrown for illegal fftSize 32768.
+PASS Exception thrown for illegal fftSize 32769.
+PASS Exception thrown for illegal fftSize 65536.
+PASS Exception thrown for illegal fftSize 65537.
+PASS Exception thrown for illegal fftSize 131072.
+PASS Exception thrown for illegal fftSize 131073.
 PASS webkitAudioContext survived multiple invalid FFT array resizings.
 PASS successfullyParsed is true
 

diff --git a/LayoutTests/webaudio/realtimeanalyser-fft-sizing.html b/LayoutTests/webaudio/realtimeanalyser-fft-sizing.html
index ba2ffd4..13a5f38 100644 (file)
--- a/LayoutTests/webaudio/realtimeanalyser-fft-sizing.html
+++ b/LayoutTests/webaudio/realtimeanalyser-fft-sizing.html
@@ -18,21 +18,32 @@ if (window.layoutTestController) {
     layoutTestController.waitUntilDone();
 }
 
-var doTest = function(fftSize) {
+var doTest = function(fftSize, illegal) {
     var c = new webkitAudioContext(1, 1000, 44100);
     var a = c.createAnalyser();
-    a.fftSize = fftSize;
+    try {
+        a.fftSize = fftSize;
+        if (illegal)
+           testFailed("No exception thrown for illegal fftSize " + fftSize + ".");
+        else
+           testPassed("Successfully set legal fftSize " +  fftSize + ".");
+    } catch(e) {
+        testPassed("Exception thrown for illegal fftSize " + fftSize + ".");
+    }
     // This arbitrary size does not affect the correctness of the test.
     var arr = new Float32Array(100);
     a.getFloatFrequencyData(arr);
 }
 
-doTest(-1);
-doTest(0);
-doTest(1);
+doTest(-1, true);
+doTest(0, true);
+doTest(1, true);
 for (var i = 2; i <= 0x20000; i *= 2) {
-    doTest(i);
-    doTest(i + 1);
+       if (i >= 128 && i <= 2048)
+        doTest(i, false);
+    else
+        doTest(i, true);
+    doTest(i + 1, true);
 }
 
 if (window.layoutTestController)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4c0ef75..31b43e3 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2012-03-22  Xingnan Wang  <xingnan.wang@intel.com>
+
+        Add exception for the setter of "fftSize" in RealtimeAnalyserNode
+        https://bugs.webkit.org/show_bug.cgi?id=81748
+
+        Reviewed by Chris Rogers.
+
+        * Modules/webaudio/RealtimeAnalyser.cpp:
+        (WebCore::RealtimeAnalyser::setFftSize):
+        * Modules/webaudio/RealtimeAnalyser.h:
+        (RealtimeAnalyser):
+        * Modules/webaudio/RealtimeAnalyserNode.cpp:
+        (WebCore::RealtimeAnalyserNode::setFftSize):
+        (WebCore):
+        * Modules/webaudio/RealtimeAnalyserNode.h:
+        (RealtimeAnalyserNode):
+        * Modules/webaudio/RealtimeAnalyserNode.idl:
+
 2012-03-22  Leo Yang  <leo.yang@torchmobile.com.cn>
 
         [BlackBerry] Add HistoryItemViewState for BlackBerry port

diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp b/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp
index 02dfedd..3757cec 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp
+++ b/Source/WebCore/Modules/webaudio/RealtimeAnalyser.cpp
@@ -78,7 +78,7 @@ void RealtimeAnalyser::reset()
     m_magnitudeBuffer.zero();
 }
 
-void RealtimeAnalyser::setFftSize(size_t size)
+bool RealtimeAnalyser::setFftSize(size_t size)
 {
     ASSERT(isMainThread());
 
@@ -86,10 +86,8 @@ void RealtimeAnalyser::setFftSize(size_t size)
     unsigned log2size = static_cast<unsigned>(log2(size));
     bool isPOT(1UL << log2size == size);
 
-    if (!isPOT || size > MaxFFTSize || size < MinFFTSize) {
-        // FIXME: It would be good to also set an exception.
-        return;
-    }
+    if (!isPOT || size > MaxFFTSize || size < MinFFTSize)
+        return false;
 
     if (m_fftSize != size) {
         m_analysisFrame = adoptPtr(new FFTFrame(size));
@@ -97,6 +95,8 @@ void RealtimeAnalyser::setFftSize(size_t size)
         m_magnitudeBuffer.allocate(size / 2);
         m_fftSize = size;
     }
+
+    return true;
 }
 
 void RealtimeAnalyser::writeInput(AudioBus* bus, size_t framesToProcess)

diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h b/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h
index 242eaca..02ea05f 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h
+++ b/Source/WebCore/Modules/webaudio/RealtimeAnalyser.h
@@ -44,7 +44,7 @@ public:
     void reset();
 
     size_t fftSize() const { return m_fftSize; }
-    void setFftSize(size_t size);
+    bool setFftSize(size_t);
 
     unsigned frequencyBinCount() const { return m_fftSize / 2; }
 

diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp b/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp
index 8d74a67..d039f3c 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp
+++ b/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.cpp
@@ -30,6 +30,7 @@
 
 #include "AudioNodeInput.h"
 #include "AudioNodeOutput.h"
+#include "ExceptionCode.h"
 
 namespace WebCore {
 
@@ -83,6 +84,12 @@ void RealtimeAnalyserNode::reset()
     m_analyser.reset();
 }
 
+void RealtimeAnalyserNode::setFftSize(unsigned int size, ExceptionCode& ec)
+{
+    if (!m_analyser.setFftSize(size))
+        ec = NOT_SUPPORTED_ERR;
+}
+
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)

diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.h b/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.h
index 022179f..ce364a9 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.h
+++ b/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.h
@@ -47,7 +47,7 @@ public:
 
     // Javascript bindings
     unsigned int fftSize() const { return m_analyser.fftSize(); }
-    void setFftSize(unsigned int size) { m_analyser.setFftSize(size); }
+    void setFftSize(unsigned int size, ExceptionCode&);
 
     unsigned frequencyBinCount() const { return m_analyser.frequencyBinCount(); }
 

diff --git a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.idl b/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.idl
index 50edbc1..dc2db80 100644 (file)
--- a/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.idl
+++ b/Source/WebCore/Modules/webaudio/RealtimeAnalyserNode.idl
@@ -27,7 +27,8 @@ module audio {
         Conditional=WEB_AUDIO,
         JSGenerateToJSObject
     ] RealtimeAnalyserNode : AudioNode {
-        attribute unsigned long fftSize;
+        attribute unsigned long fftSize
+            setter raises(DOMException);
         readonly attribute unsigned long frequencyBinCount;
 
         // minDecibels / maxDecibels represent the range to scale the FFT analysis data for conversion to unsigned byte values.