Skip to content

Introduce AudioProcessor::before_drop pre-destructor hook #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 78 additions & 0 deletions src/node/audio_buffer_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -771,13 +771,23 @@ impl AudioProcessor for AudioBufferSourceRenderer {

log::warn!("AudioBufferSourceRenderer: Dropping incoming message {msg:?}");
}

fn before_drop(&mut self, scope: &AudioWorkletGlobalScope) {
if !self.ended_triggered && scope.current_time >= self.start_time {
scope.send_ended_event();
self.ended_triggered = true;
}
}
}

#[cfg(test)]
mod tests {
use float_eq::assert_float_eq;
use std::f32::consts::PI;

use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;

use crate::context::{BaseAudioContext, OfflineAudioContext};
use crate::RENDER_QUANTUM_SIZE;

Expand Down Expand Up @@ -1458,4 +1468,72 @@ mod tests {
src.stop();
src.stop();
}

#[test]
fn test_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let mut src = context.create_buffer_source();
src.start_at(0.);
src.stop_at(0.5);

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(ended.load(Ordering::Relaxed));
}

#[test]
fn test_no_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let src = context.create_constant_source();

// do not start the node

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(!ended.load(Ordering::Relaxed)); // should not have triggered
}

#[test]
fn test_exact_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let mut src = context.create_buffer_source();
src.start_at(0.);
src.stop_at(1.); // end right at the end of the offline buffer

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(ended.load(Ordering::Relaxed));
}

#[test]
fn test_implicit_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let mut src = context.create_buffer_source();
src.start_at(0.);
// no explicit stop, so we stop at end of offline context

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(ended.load(Ordering::Relaxed));
}
}
78 changes: 78 additions & 0 deletions src/node/constant_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,13 @@ impl AudioProcessor for ConstantSourceRenderer {

log::warn!("ConstantSourceRenderer: Dropping incoming message {msg:?}");
}

fn before_drop(&mut self, scope: &AudioWorkletGlobalScope) {
if !self.ended_triggered && scope.current_time >= self.start_time {
scope.send_ended_event();
self.ended_triggered = true;
}
}
}

#[cfg(test)]
Expand All @@ -264,6 +271,9 @@ mod tests {

use float_eq::assert_float_eq;

use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;

use super::*;

#[test]
Expand Down Expand Up @@ -369,4 +379,72 @@ mod tests {
src.stop();
src.stop();
}

#[test]
fn test_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let mut src = context.create_constant_source();
src.start_at(0.);
src.stop_at(0.5);

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(ended.load(Ordering::Relaxed));
}

#[test]
fn test_no_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let src = context.create_constant_source();

// do not start the node

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(!ended.load(Ordering::Relaxed)); // should not have triggered
}

#[test]
fn test_exact_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let mut src = context.create_constant_source();
src.start_at(0.);
src.stop_at(1.); // end right at the end of the offline buffer

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(ended.load(Ordering::Relaxed));
}

#[test]
fn test_implicit_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let mut src = context.create_constant_source();
src.start_at(0.);
// no explicit stop, so we stop at end of offline context

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(ended.load(Ordering::Relaxed));
}
}
78 changes: 78 additions & 0 deletions src/node/oscillator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,13 @@ impl AudioProcessor for OscillatorRenderer {

log::warn!("OscillatorRenderer: Dropping incoming message {msg:?}");
}

fn before_drop(&mut self, scope: &AudioWorkletGlobalScope) {
if !self.ended_triggered && scope.current_time >= self.start_time {
scope.send_ended_event();
self.ended_triggered = true;
}
}
}

impl OscillatorRenderer {
Expand Down Expand Up @@ -608,6 +615,9 @@ mod tests {
use float_eq::assert_float_eq;
use std::f64::consts::PI;

use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;

use crate::context::{BaseAudioContext, OfflineAudioContext};
use crate::node::{AudioNode, AudioScheduledSourceNode};
use crate::periodic_wave::{PeriodicWave, PeriodicWaveOptions};
Expand Down Expand Up @@ -1247,4 +1257,72 @@ mod tests {
osc.stop();
osc.stop();
}

#[test]
fn test_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let mut src = context.create_oscillator();
src.start_at(0.);
src.stop_at(0.5);

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(ended.load(Ordering::Relaxed));
}

#[test]
fn test_no_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let src = context.create_oscillator();

// do not start the node

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(!ended.load(Ordering::Relaxed)); // should not have triggered
}

#[test]
fn test_exact_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let mut src = context.create_oscillator();
src.start_at(0.);
src.stop_at(1.); // end right at the end of the offline buffer

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(ended.load(Ordering::Relaxed));
}

#[test]
fn test_implicit_ended_event() {
let mut context = OfflineAudioContext::new(2, 44_100, 44_100.);
let mut src = context.create_oscillator();
src.start_at(0.);
// no explicit stop, so we stop at end of offline context

let ended = Arc::new(AtomicBool::new(false));
let ended_clone = Arc::clone(&ended);
src.set_onended(move |_event| {
ended_clone.store(true, Ordering::Relaxed);
});

let _ = context.start_rendering_sync();
assert!(ended.load(Ordering::Relaxed));
}
}
8 changes: 8 additions & 0 deletions src/render/graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@ impl Graph {
let mut node = self.nodes.remove(*index).into_inner();
self.reclaim_id_channel
.push(node.reclaim_id.take().unwrap());
node.processor.before_drop(scope);
drop(node);

// And remove it from the ordering after we have processed all nodes
Expand Down Expand Up @@ -536,6 +537,13 @@ impl Graph {
// Return the output buffer of destination node
&self.nodes.get_unchecked_mut(AudioNodeId(0)).outputs[0]
}

pub fn before_drop(&mut self, scope: &AudioWorkletGlobalScope) {
self.nodes.iter_mut().for_each(|(id, node)| {
scope.node_id.set(id);
node.get_mut().processor.before_drop(scope);
});
}
}

#[cfg(test)]
Expand Down
8 changes: 8 additions & 0 deletions src/render/node_collection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ impl NodeCollection {
self.nodes.iter_mut().filter_map(Option::as_mut)
}

#[inline(always)]
pub fn iter_mut(&mut self) -> impl Iterator<Item = (AudioNodeId, &mut RefCell<Node>)> {
self.nodes
.iter_mut()
.enumerate()
.filter_map(|(i, v)| v.as_mut().map(|m| (AudioNodeId(i as u64), m)))
}

#[inline(always)]
pub fn contains(&self, index: AudioNodeId) -> bool {
self.nodes[index.0 as usize].is_some()
Expand Down
2 changes: 2 additions & 0 deletions src/render/processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ pub trait AudioProcessor: Send {
fn has_side_effects(&self) -> bool {
false
}

fn before_drop(&mut self, _scope: &AudioWorkletGlobalScope) {}
}

impl std::fmt::Debug for dyn AudioProcessor {
Expand Down
Loading
Loading