Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use audio graph processing state

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-06-22 14:54:39 +02:00
parent 03dede3abb
commit 547e6e84b0
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
components/script/dom/baseaudiocontext.rs
View file

@ -20,11 +20,10 @@ use dom::promise::Promise;
use dom::window::Window; use dom::window::Window;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use servo_media::ServoMedia; use servo_media::ServoMedia;
use servo_media::audio::graph::AudioGraph; use servo_media::audio::graph::{AudioGraph, ProcessingState};
use servo_media::audio::graph::{OfflineAudioGraphOptions, RealTimeAudioGraphOptions}; use servo_media::audio::graph::{OfflineAudioGraphOptions, RealTimeAudioGraphOptions};
use servo_media::audio::graph_impl::NodeId; use servo_media::audio::graph_impl::NodeId;
use servo_media::audio::node::AudioNodeType; use servo_media::audio::node::AudioNodeType;
use std::cell::Cell;
use std::rc::Rc; use std::rc::Rc;
use task_source::TaskSource; use task_source::TaskSource;
@ -42,8 +41,6 @@ pub struct BaseAudioContext {
destination: Option<DomRoot<AudioDestinationNode>>, destination: Option<DomRoot<AudioDestinationNode>>,
/// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-samplerate /// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-samplerate
sample_rate: f32, sample_rate: f32,
/// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-state
state: Cell<AudioContextState>,
/// https://webaudio.github.io/web-audio-api/#pendingresumepromises /// https://webaudio.github.io/web-audio-api/#pendingresumepromises
#[ignore_malloc_size_of = "promises are hard"] #[ignore_malloc_size_of = "promises are hard"]
pending_resume_promises: DomRefCell<Vec<Rc<Promise>>>, pending_resume_promises: DomRefCell<Vec<Rc<Promise>>>,
@ -68,7 +65,6 @@ impl BaseAudioContext {
audio_graph: ServoMedia::get().unwrap().create_audio_graph(Some(options.into())), audio_graph: ServoMedia::get().unwrap().create_audio_graph(Some(options.into())),
destination: None, destination: None,
sample_rate, sample_rate,
state: Cell::new(AudioContextState::Suspended),
pending_resume_promises: Default::default(), pending_resume_promises: Default::default(),
}; };
@ -88,18 +84,19 @@ impl BaseAudioContext {
// https://webaudio.github.io/web-audio-api/#allowed-to-start // https://webaudio.github.io/web-audio-api/#allowed-to-start
pub fn is_allowed_to_start(&self) -> bool { pub fn is_allowed_to_start(&self) -> bool {
self.state.get() == AudioContextState::Suspended let state: AudioContextState = self.audio_graph.state().into();
state == AudioContextState::Suspended
} }
pub fn resume(&self) { pub fn resume(&self) {
let window = DomRoot::downcast::<Window>(self.global()).unwrap(); let window = DomRoot::downcast::<Window>(self.global()).unwrap();
let task_source = window.dom_manipulation_task_source(); let task_source = window.dom_manipulation_task_source();
// Set the state attribute to `running`. // Set the state attribute to `running` and start rendering audio.
let this = Trusted::new(self); let this = Trusted::new(self);
task_source.queue(task!(set_state: move || { task_source.queue(task!(resume: move || {
let this = this.root(); let this = this.root();
this.state.set(AudioContextState::Running); this.audio_graph.resume();
}), window.upcast()).unwrap(); }), window.upcast()).unwrap();
// Queue a task to fire a simple event named `statechange` at the AudioContext. // Queue a task to fire a simple event named `statechange` at the AudioContext.
@ -125,7 +122,7 @@ impl BaseAudioContextMethods for BaseAudioContext {
// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-state // https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-state
fn State(&self) -> AudioContextState { fn State(&self) -> AudioContextState {
self.state.get() self.audio_graph.state().into()
} }
// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-resume // https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-resume
@ -151,3 +148,13 @@ impl BaseAudioContextMethods for BaseAudioContext {
OscillatorNode::new(&window, &self, &options) OscillatorNode::new(&window, &self, &options)
} }
} }
impl From<ProcessingState> for AudioContextState {
fn from(state: ProcessingState) -> Self {
match state {
ProcessingState::Suspended => AudioContextState::Suspended,
ProcessingState::Running => AudioContextState::Running,
ProcessingState::Closed => AudioContextState::Closed,
}
}
}