Changeset 217919 in webkit

Timestamp:

Jun 7, 2017 9:31:31 PM (7 years ago)

Author:

jer.noble@apple.com

Message:

[Web Audio] createScriptProcessor throws IndexSizeError for valid arguments
​https://bugs.webkit.org/show_bug.cgi?id=173022

Reviewed by Sam Weinig.

Source/WebCore:

Updated test: webaudio/javascriptaudionode.html

The Web Audio spec (<​https://webaudio.github.io/web-audio-api/>, 06 June 2017) defines a default behavior when
clients pass in a value of 0 for bufferSize to the createScriptProcessor() method.

• Modules/webaudio/AudioContext.cpp:

(WebCore::AudioContext::createScriptProcessor):

• Modules/webaudio/AudioContext.idl:
• Modules/webaudio/ScriptProcessorNode.cpp:

(WebCore::ScriptProcessorNode::create):

• Modules/webaudio/ScriptProcessorNode.h:

LayoutTests:

• webaudio/javascriptaudionode-expected.txt:
• webaudio/javascriptaudionode.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/javascriptaudionode-expected.txt (modified) (1 diff)
• LayoutTests/webaudio/javascriptaudionode.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioContext.cpp (modified) (2 diffs)
• Source/WebCore/Modules/webaudio/AudioContext.idl (modified) (1 diff)
• Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp (modified) (1 diff)
• Source/WebCore/Modules/webaudio/ScriptProcessorNode.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-06-07  Jer Noble  <jer.noble@apple.com>
+
+        [Web Audio] createScriptProcessor throws IndexSizeError for valid arguments
+        https://bugs.webkit.org/show_bug.cgi?id=173022
+
+        Reviewed by Sam Weinig.
+
+        * webaudio/javascriptaudionode-expected.txt:
+        * webaudio/javascriptaudionode.html:
+
 2017-06-07  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/webaudio/javascriptaudionode-expected.txt

@@ -9 +9 @@
 PASS Successfully created ScriptProcessorNode with numberOfInputChannels = 0 and numberOfOutputChannels = 2.
 PASS Exception was thrown for illegal bufferSize.
+PASS Successfully created ScriptProcessorNode with bufferSize = 0.
 PASS Successfully created ScriptProcessorNode with bufferSize = 256.
 PASS Successfully created ScriptProcessorNode with bufferSize = 512.

trunk/LayoutTests/webaudio/javascriptaudionode.html

@@ -124 +124 @@
     }
 
+    doBufferSizeTest(0);
     doBufferSizeTest(256);
     doBufferSizeTest(512);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-06-07  Jer Noble  <jer.noble@apple.com>
+
+        [Web Audio] createScriptProcessor throws IndexSizeError for valid arguments
+        https://bugs.webkit.org/show_bug.cgi?id=173022
+
+        Reviewed by Sam Weinig.
+
+        Updated test: webaudio/javascriptaudionode.html
+
+        The Web Audio spec (<https://webaudio.github.io/web-audio-api/>, 06 June 2017) defines a default behavior when
+        clients pass in a value of 0 for bufferSize to the createScriptProcessor() method.
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::createScriptProcessor):
+        * Modules/webaudio/AudioContext.idl:
+        * Modules/webaudio/ScriptProcessorNode.cpp:
+        (WebCore::ScriptProcessorNode::create):
+        * Modules/webaudio/ScriptProcessorNode.h:
+
 2017-06-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp

@@ -38 +38 @@
 #include "AudioNodeInput.h"
 #include "AudioNodeOutput.h"
+#include "AudioSession.h"
 #include "BiquadFilterNode.h"
 #include "ChannelMergerNode.h"
@@ -489 +490 @@
     ASSERT(isMainThread());
     lazyInitialize();
+
+    // W3C Editor's Draft 06 June 2017
+    //  https://webaudio.github.io/web-audio-api/#widl-BaseAudioContext-createScriptProcessor-ScriptProcessorNode-unsigned-long-bufferSize-unsigned-long-numberOfInputChannels-unsigned-long-numberOfOutputChannels
+
+    // The bufferSize parameter determines the buffer size in units of sample-frames. If it's not passed in,
+    // or if the value is 0, then the implementation will choose the best buffer size for the given environment,
+    // which will be constant power of 2 throughout the lifetime of the node. ... If the value of this parameter
+    // is not one of the allowed power-of-2 values listed above, an IndexSizeError must be thrown.
+    switch (bufferSize) {
+    case 0:
+#if USE(AUDIO_SESSION)
+        // Pick a value between 256 (2^8) and 16384 (2^14), based on the buffer size of the current AudioSession:
+        bufferSize = 1 << std::max<size_t>(8, std::min<size_t>(14, std::log2(AudioSession::sharedSession().bufferSize())));
+#else
+        bufferSize = 2048;
+#endif
+        break;
+    case 256:
+    case 512:
+    case 1024:
+    case 2048:
+    case 4096:
+    case 8192:
+    case 16384:
+        break;
+    default:
+        return Exception { INDEX_SIZE_ERR };
+    }
+
+    // An IndexSizeError exception must be thrown if bufferSize or numberOfInputChannels or numberOfOutputChannels
+    // are outside the valid range. It is invalid for both numberOfInputChannels and numberOfOutputChannels to be zero.
+    // In this case an IndexSizeError must be thrown.
+
+    if (!numberOfInputChannels && !numberOfOutputChannels)
+        return Exception { NOT_SUPPORTED_ERR };
+
+    // This parameter [numberOfInputChannels] determines the number of channels for this node's input. Values of
+    // up to 32 must be supported. A NotSupportedError must be thrown if the number of channels is not supported.
+
+    if (numberOfInputChannels > maxNumberOfChannels())
+        return Exception { NOT_SUPPORTED_ERR };
+
+    // This parameter [numberOfOutputChannels] determines the number of channels for this node's output. Values of
+    // up to 32 must be supported. A NotSupportedError must be thrown if the number of channels is not supported.
+
+    if (numberOfOutputChannels > maxNumberOfChannels())
+        return Exception { NOT_SUPPORTED_ERR };
+
     auto node = ScriptProcessorNode::create(*this, m_destinationNode->sampleRate(), bufferSize, numberOfInputChannels, numberOfOutputChannels);
 
-    if (!node)
-        return Exception { INDEX_SIZE_ERR };
-
-    refNode(*node); // context keeps reference until we stop making javascript rendering callbacks
-    return node.releaseNonNull();
+    refNode(node); // context keeps reference until we stop making javascript rendering callbacks
+    return WTFMove(node);
 }
 

trunk/Source/WebCore/Modules/webaudio/AudioContext.idl

@@ -86 +86 @@
     DynamicsCompressorNode createDynamicsCompressor();
     AnalyserNode createAnalyser();
-    [MayThrowException] ScriptProcessorNode createScriptProcessor(unsigned long bufferSize, optional unsigned long numberOfInputChannels = 2, optional unsigned long numberOfOutputChannels = 2);
+    [MayThrowException] ScriptProcessorNode createScriptProcessor(optional unsigned long bufferSize = 0, optional unsigned long numberOfInputChannels = 2, optional unsigned long numberOfOutputChannels = 2);
     OscillatorNode createOscillator();
     [MayThrowException] PeriodicWave createPeriodicWave(Float32Array real, Float32Array imag);

trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp

@@ -42 +42 @@
 namespace WebCore {
 
-RefPtr<ScriptProcessorNode> ScriptProcessorNode::create(AudioContext& context, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels)
-{
-    // Check for valid buffer size.
-    switch (bufferSize) {
-    case 256:
-    case 512:
-    case 1024:
-    case 2048:
-    case 4096:
-    case 8192:
-    case 16384:
-        break;
-    default:
-        return nullptr;
-    }
-
-    if (!numberOfInputChannels && !numberOfOutputChannels)
-        return nullptr;
-
-    if (numberOfInputChannels > AudioContext::maxNumberOfChannels())
-        return nullptr;
-
-    if (numberOfOutputChannels > AudioContext::maxNumberOfChannels())
-        return nullptr;
-
+Ref<ScriptProcessorNode> ScriptProcessorNode::create(AudioContext& context, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels)
+{
     return adoptRef(*new ScriptProcessorNode(context, sampleRate, bufferSize, numberOfInputChannels, numberOfOutputChannels));
 }

trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h

@@ -52 +52 @@
     // Lower numbers for bufferSize will result in a lower (better) latency. Higher numbers will be necessary to avoid audio breakup and glitches.
     // The value chosen must carefully balance between latency and audio quality.
-    static RefPtr<ScriptProcessorNode> create(AudioContext&, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels);
+    static Ref<ScriptProcessorNode> create(AudioContext&, float sampleRate, size_t bufferSize, unsigned numberOfInputChannels, unsigned numberOfOutputChannels);
 
     virtual ~ScriptProcessorNode();