Changeset 116465 in webkit

Timestamp:

May 8, 2012 4:24:04 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

JavaScriptAudioNode should not ASSERT if number of input channels is 0
​https://bugs.webkit.org/show_bug.cgi?id=85818

Patch by Raymond Toy <Raymond Toy> on 2012-05-08
Reviewed by Eric Seidel.

Source/WebCore:

Test: webaudio/javascriptaudionode-zero-input-channels.html

• Modules/webaudio/JavaScriptAudioNode.cpp:

(WebCore::JavaScriptAudioNode::process): Update buffersAreGood.
(WebCore::JavaScriptAudioNode::fireProcessEvent): Remove ASSERT.

LayoutTests:

• webaudio/javascriptaudionode-zero-input-channels-expected.txt: Added.
• webaudio/javascriptaudionode-zero-input-channels.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/javascriptaudionode-zero-input-channels-expected.txt (added)
• LayoutTests/webaudio/javascriptaudionode-zero-input-channels.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/JavaScriptAudioNode.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-08  Raymond Toy  <rtoy@google.com>
+
+        JavaScriptAudioNode should not ASSERT if number of input channels is 0
+        https://bugs.webkit.org/show_bug.cgi?id=85818
+
+        Reviewed by Eric Seidel.
+
+        * webaudio/javascriptaudionode-zero-input-channels-expected.txt: Added.
+        * webaudio/javascriptaudionode-zero-input-channels.html: Added.
+
 2012-05-08  Alexander Shalamov  <alexander.shalamov@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-08  Raymond Toy  <rtoy@google.com>
+
+        JavaScriptAudioNode should not ASSERT if number of input channels is 0
+        https://bugs.webkit.org/show_bug.cgi?id=85818
+
+        Reviewed by Eric Seidel.
+
+        Test: webaudio/javascriptaudionode-zero-input-channels.html
+
+        * Modules/webaudio/JavaScriptAudioNode.cpp:
+        (WebCore::JavaScriptAudioNode::process): Update buffersAreGood.
+        (WebCore::JavaScriptAudioNode::fireProcessEvent): Remove ASSERT.
+
 2012-05-08  Dana Jansens  <danakj@chromium.org>
 

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

@@ -152 +152 @@
 
     // Check the consistency of input and output buffers.
-    bool buffersAreGood = inputBuffer && outputBuffer && bufferSize() == inputBuffer->length() && bufferSize() == outputBuffer->length()
-        && m_bufferReadWriteIndex + framesToProcess <= bufferSize();
+    unsigned numberOfInputChannels = m_internalInputBus.numberOfChannels();
+    bool buffersAreGood = outputBuffer && bufferSize() == outputBuffer->length() && m_bufferReadWriteIndex + framesToProcess <= bufferSize();
+
+    // If the number of input channels is zero, it's ok to have inputBuffer = 0.
+    if (m_internalInputBus.numberOfChannels())
+        buffersAreGood = buffersAreGood && inputBuffer && bufferSize() == inputBuffer->length();
+
     ASSERT(buffersAreGood);
     if (!buffersAreGood)
@@ -164 +169 @@
         return;
 
-    unsigned numberOfInputChannels = m_internalInputBus.numberOfChannels();
     unsigned numberOfOutputChannels = outputBus->numberOfChannels();
 
@@ -232 +236 @@
     AudioBuffer* inputBuffer = m_inputBuffers[m_doubleBufferIndexForEvent].get();
     AudioBuffer* outputBuffer = m_outputBuffers[m_doubleBufferIndexForEvent].get();
-    ASSERT(inputBuffer && outputBuffer);
-    if (!inputBuffer || !outputBuffer)
+    ASSERT(outputBuffer);
+    if (!outputBuffer)
         return;