Merge remote-tracking branch 'origin/main' into feature/rename-channelconfig-audionodeoption

Author: orottier

src/node/dynamics_compressor.rs

@@ -8,7 +8,7 @@ use crate::render::{
 };
 use crate::{AtomicF32, RENDER_QUANTUM_SIZE};
 
-use super::{AudioNode, AudioNodeOptions, ChannelConfig};
+use super::{AudioNode, AudioNodeOptions, ChannelConfig, ChannelCountMode, ChannelInterpretation};
 
 // Converting a value 𝑣 in decibels to linear gain unit means returning 10𝑣/20.
 fn db_to_lin(val: f32) -> f32 {
@@ -53,11 +53,48 @@ impl Default for DynamicsCompressorOptions {
             ratio: 12.,      // unit less
             release: 0.25,   // seconds
             threshold: -24., // dB
-            audio_node_options: AudioNodeOptions::default(),
+            audio_node_options: AudioNodeOptions {
+                channel_count: 2,
+                channel_count_mode: ChannelCountMode::ClampedMax,
+                channel_interpretation: ChannelInterpretation::Speakers,
+            },
         }
     }
 }
 
+/// Assert that the channel count is valid for the DynamicsCompressorNode
+/// see <https://webaudio.github.io/web-audio-api/#audionode-channelcount-constraints>
+///
+/// # Panics
+///
+/// This function panics if given count is greater than 2
+///
+#[track_caller]
+#[inline(always)]
+fn assert_valid_channel_count(count: usize) {
+    assert!(
+        count <= 2,
+        "NotSupportedError - DynamicsCompressorNode channel count cannot be greater than two"
+    );
+}
+
+/// Assert that the channel count is valid for the DynamicsCompressorNode
+/// see <https://webaudio.github.io/web-audio-api/#audionode-channelcountmode-constraints>
+///
+/// # Panics
+///
+/// This function panics if given count mode is [`ChannelCountMode::Max`]
+///
+#[track_caller]
+#[inline(always)]
+fn assert_valid_channel_count_mode(mode: ChannelCountMode) {
+    assert_ne!(
+        mode,
+        ChannelCountMode::Max,
+        "NotSupportedError - DynamicsCompressorNode channel count mode cannot be set to max"
+    );
+}
+
 /// `DynamicsCompressorNode` provides a compression effect.
 ///
 /// It lowers the volume of the loudest parts of the signal and raises the volume
@@ -126,11 +163,27 @@ impl AudioNode for DynamicsCompressorNode {
     fn number_of_outputs(&self) -> usize {
         1
     }
+
+    // see <https://webaudio.github.io/web-audio-api/#audionode-channelcount-constraints>
+    fn set_channel_count(&self, count: usize) {
+        assert_valid_channel_count(count);
+        self.channel_config.set_count(count, self.registration());
+    }
+
+    // see <https://webaudio.github.io/web-audio-api/#audionode-channelcountmode-constraints>
+    fn set_channel_count_mode(&self, mode: ChannelCountMode) {
+        assert_valid_channel_count_mode(mode);
+        self.channel_config
+            .set_count_mode(mode, self.registration());
+    }
 }
 
 impl DynamicsCompressorNode {
     pub fn new<C: BaseAudioContext>(context: &C, options: DynamicsCompressorOptions) -> Self {
         context.base().register(move |registration| {
+            assert_valid_channel_count(options.audio_node_options.channel_count);
+            assert_valid_channel_count_mode(options.audio_node_options.channel_count_mode);
+
             // attack, knee, ratio, release and threshold have automation rate constraints
             // https://webaudio.github.io/web-audio-api/#audioparam-automation-rate-constraints
             let attack_param_opts = AudioParamDescriptor {

src/node/waveshaper.rs

@@ -379,6 +379,9 @@ struct WaveShaperRenderer {
     downsampler_x2: Resampler,
     // down sampler configured to divide by 4 the upsampled signal
     downsampler_x4: Resampler,
+    // check if silence can be propagated, i.e. if curve if None or if
+    // it's output value for zero signal is zero (i.e. < 1e-9)
+    can_propagate_silence: bool,
 }
 
 impl AudioProcessor for WaveShaperRenderer {
@@ -393,7 +396,7 @@ impl AudioProcessor for WaveShaperRenderer {
         let input = &inputs[0];
         let output = &mut outputs[0];
 
-        if input.is_silent() {
+        if input.is_silent() && self.can_propagate_silence {
             output.make_silent();
             return false;
         }
@@ -495,6 +498,19 @@ impl AudioProcessor for WaveShaperRenderer {
 
         if let Some(curve) = msg.downcast_mut::<Option<Vec<f32>>>() {
             std::mem::swap(&mut self.curve, curve);
+
+            self.can_propagate_silence = if let Some(curve) = &self.curve {
+                if curve.len() % 2 == 1 {
+                    curve[curve.len() / 2].abs() < 1e-9
+                } else {
+                    let a = curve[curve.len() / 2 - 1];
+                    let b = curve[curve.len() / 2];
+                    ((a + b) / 2.).abs() < 1e-9
+                }
+            } else {
+                true
+            };
+
             return;
         }
 
@@ -534,6 +550,7 @@ impl WaveShaperRenderer {
             upsampler_x4,
             downsampler_x2,
             downsampler_x4,
+            can_propagate_silence: true,
         }
     }
 }