Changeset 94780 in webkit

Timestamp:

Sep 8, 2011 12:22:59 PM (13 years ago)

Author:

crogers@google.com

Message:

Check AudioContext createChannelMerger() for thread safety
​https://bugs.webkit.org/show_bug.cgi?id=67247

Reviewed by Kenneth Russell.

Source/WebCore:

Test: webaudio/audiochannelmerger-stereo.html

• webaudio/AudioChannelMerger.cpp:

(WebCore::AudioChannelMerger::process):
(WebCore::AudioChannelMerger::checkNumberOfChannelsForInput):

• webaudio/AudioChannelMerger.h:

LayoutTests:

• webaudio/audiochannelmerger-stereo-expected.txt: Added.
• webaudio/audiochannelmerger-stereo.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/audiochannelmerger-stereo-expected.txt (added)
• LayoutTests/webaudio/audiochannelmerger-stereo.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/webaudio/AudioChannelMerger.cpp (modified) (4 diffs)
• Source/WebCore/webaudio/AudioChannelMerger.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-08  Chris Rogers  <crogers@google.com>
+
+        Check AudioContext createChannelMerger() for thread safety
+        https://bugs.webkit.org/show_bug.cgi?id=67247
+
+        Reviewed by Kenneth Russell.
+
+        * webaudio/audiochannelmerger-stereo-expected.txt: Added.
+        * webaudio/audiochannelmerger-stereo.html: Added.
+
 2011-09-08  Fady Samuel  <fsamuel@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-08  Chris Rogers  <crogers@google.com>
+
+        Check AudioContext createChannelMerger() for thread safety
+        https://bugs.webkit.org/show_bug.cgi?id=67247
+
+        Reviewed by Kenneth Russell.
+
+        Test: webaudio/audiochannelmerger-stereo.html
+
+        * webaudio/AudioChannelMerger.cpp:
+        (WebCore::AudioChannelMerger::process):
+        (WebCore::AudioChannelMerger::checkNumberOfChannelsForInput):
+        * webaudio/AudioChannelMerger.h:
+
 2011-09-08  Ned Holbrook  <nholbrook@apple.com>
 

trunk/Source/WebCore/webaudio/AudioChannelMerger.cpp

@@ -33 +33 @@
 #include "AudioChannelMerger.h"
 
+#include "AudioContext.h"
 #include "AudioNodeInput.h"
 #include "AudioNodeOutput.h"
@@ -62 +63 @@
     ASSERT_UNUSED(framesToProcess, framesToProcess == output->bus()->length());    
     
-    // Count how many channels we have all together from all of the inputs.
-    unsigned numberOfOutputChannels = 0;
-    for (unsigned i = 0; i < numberOfInputs(); ++i) {
-        AudioNodeInput* input = this->input(i);
-        if (input->isConnected())
-            numberOfOutputChannels += input->bus()->numberOfChannels();
-    }
-
-    // Set the correct number of channels on the output
-    output->setNumberOfChannels(numberOfOutputChannels);
-    
-    // Now merge the channels back into one output.
+    // Merge all the channels from all the inputs into one output.
     unsigned outputChannelIndex = 0;
     for (unsigned i = 0; i < numberOfInputs(); ++i) {
@@ -91 +81 @@
     }
     
-    ASSERT(outputChannelIndex == numberOfOutputChannels);
+    ASSERT(outputChannelIndex == output->numberOfChannels());
 }
 
@@ -98 +88 @@
 }
 
+// Any time a connection or disconnection happens on any of our inputs, we potentially need to change the
+// number of channels of our output.
+void AudioChannelMerger::checkNumberOfChannelsForInput(AudioNodeInput* input)
+{
+    ASSERT(context()->isAudioThread() && context()->isGraphOwner());
+
+    // Count how many channels we have all together from all of the inputs.
+    unsigned numberOfOutputChannels = 0;
+    for (unsigned i = 0; i < numberOfInputs(); ++i) {
+        AudioNodeInput* input = this->input(i);
+        if (input->isConnected())
+            numberOfOutputChannels += input->bus()->numberOfChannels();
+    }
+
+    // Set the correct number of channels on the output
+    AudioNodeOutput* output = this->output(0);
+    ASSERT(output);
+    output->setNumberOfChannels(numberOfOutputChannels);
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/webaudio/AudioChannelMerger.h

@@ -48 +48 @@
     virtual void reset();
 
+    // Called in the audio thread (pre-rendering task) when the number of channels for an input may have changed.
+    virtual void checkNumberOfChannelsForInput(AudioNodeInput*);
+
 private:
     AudioChannelMerger(AudioContext*, double sampleRate);