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

Keep a map between channel position and channel index for decoded audio

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2019-04-16 17:30:22 +02:00
parent dd2deeabca
commit 292d1705a3
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ use servo_media::audio::graph::NodeId;
use servo_media::ServoMedia; use servo_media::ServoMedia;
use servo_media_auto::Backend; use servo_media_auto::Backend;
use std::cell::Cell; use std::cell::Cell;
use std::collections::hash_map::Entry;
use std::collections::{HashMap, VecDeque}; use std::collections::{HashMap, VecDeque};
use std::mem; use std::mem;
use std::rc::Rc; use std::rc::Rc;
@ -435,6 +436,11 @@ impl BaseAudioContextMethods for BaseAudioContext {
let decoded_audio = Arc::new(Mutex::new(Vec::new())); let decoded_audio = Arc::new(Mutex::new(Vec::new()));
let decoded_audio_ = decoded_audio.clone(); let decoded_audio_ = decoded_audio.clone();
let decoded_audio__ = decoded_audio.clone(); let decoded_audio__ = decoded_audio.clone();
// servo-media returns an audio channel position along
// with the AudioDecoderCallback progress callback, which
// may not be the same as the index of the decoded_audio
// Vec.
let channels = Arc::new(Mutex::new(HashMap::new()));
let this = Trusted::new(self); let this = Trusted::new(self);
let this_ = this.clone(); let this_ = this.clone();
let (task_source, canceller) = window let (task_source, canceller) = window
@ -450,8 +456,13 @@ impl BaseAudioContextMethods for BaseAudioContext {
.unwrap() .unwrap()
.resize(channel_count as usize, Vec::new()); .resize(channel_count as usize, Vec::new());
}) })
.progress(move |buffer, channel| { .progress(move |buffer, channel_pos| {
let mut decoded_audio = decoded_audio_.lock().unwrap(); let mut decoded_audio = decoded_audio_.lock().unwrap();
let mut channels = channels.lock().unwrap();
let channel = match channels.entry(channel_pos) {
Entry::Occupied(entry) => *entry.get(),
Entry::Vacant(entry) => *entry.insert(decoded_audio.len()),
};
decoded_audio[(channel - 1) as usize].extend_from_slice((*buffer).as_ref()); decoded_audio[(channel - 1) as usize].extend_from_slice((*buffer).as_ref());
}) })
.eos(move || { .eos(move || {