Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Copy AudioBufferSourceNode buffer

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-07-06 10:12:51 +02:00
parent 356d7fd7a6
commit 23f7a73622
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/script/dom/audiobuffer.rs
View file

@ -16,7 +16,6 @@ use js::rust::CustomAutoRooterGuard;
use js::typedarray::{CreateWith, Float32Array}; use js::typedarray::{CreateWith, Float32Array};
use servo_media::audio::buffer_source_node::AudioBuffer as ServoMediaAudioBuffer; use servo_media::audio::buffer_source_node::AudioBuffer as ServoMediaAudioBuffer;
use std::ptr::{self, NonNull}; use std::ptr::{self, NonNull};
use std::sync::{Arc, Mutex};
type JSAudioChannel = Heap<*mut JSObject>; type JSAudioChannel = Heap<*mut JSObject>;
@ -24,8 +23,8 @@ type JSAudioChannel = Heap<*mut JSObject>;
pub struct AudioBuffer { pub struct AudioBuffer {
reflector_: Reflector, reflector_: Reflector,
js_channels: DomRefCell<Vec<JSAudioChannel>>, js_channels: DomRefCell<Vec<JSAudioChannel>>,
#[ignore_malloc_size_of = "Arc"] #[ignore_malloc_size_of = "servo_media"]
shared_channels: Arc<Mutex<ServoMediaAudioBuffer>>, shared_channels: DomRefCell<ServoMediaAudioBuffer>,
sample_rate: f32, sample_rate: f32,
length: u32, length: u32,
duration: f64, duration: f64,
@ -53,12 +52,11 @@ impl AudioBuffer {
AudioBuffer { AudioBuffer {
reflector_: Reflector::new(), reflector_: Reflector::new(),
js_channels: DomRefCell::new(js_channels), js_channels: DomRefCell::new(js_channels),
shared_channels: Arc::new(Mutex::new( shared_channels: DomRefCell::new(ServoMediaAudioBuffer::new(number_of_channels as u8, length as usize)),
ServoMediaAudioBuffer::new(number_of_channels as u8, length as usize))), sample_rate,
sample_rate: sample_rate, length,
length: length,
duration: length as f64 / sample_rate as f64, duration: length as f64 / sample_rate as f64,
number_of_channels: number_of_channels, number_of_channels,
} }
} }
@ -89,7 +87,7 @@ impl AudioBuffer {
// Move the channel data from shared_channels to js_channels. // Move the channel data from shared_channels to js_channels.
rooted!(in (cx) let mut array = ptr::null_mut::<JSObject>()); rooted!(in (cx) let mut array = ptr::null_mut::<JSObject>());
let shared_channel = (*self.shared_channels.lock().unwrap()).buffers.remove(i); let shared_channel = (*self.shared_channels.borrow_mut()).buffers.remove(i);
if unsafe { if unsafe {
Float32Array::create(cx, CreateWith::Slice(&shared_channel), array.handle_mut()) Float32Array::create(cx, CreateWith::Slice(&shared_channel), array.handle_mut())
}.is_err() { }.is_err() {
@ -103,7 +101,7 @@ impl AudioBuffer {
/// https://webaudio.github.io/web-audio-api/#acquire-the-content /// https://webaudio.github.io/web-audio-api/#acquire-the-content
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub fn acquire_contents(&self) -> Option<Arc<Mutex<ServoMediaAudioBuffer>>> { pub fn acquire_contents(&self) -> Option<ServoMediaAudioBuffer> {
let cx = self.global().get_cx(); let cx = self.global().get_cx();
for (i, channel) in self.js_channels.borrow_mut().iter().enumerate() { for (i, channel) in self.js_channels.borrow_mut().iter().enumerate() {
// Step 1. // Step 1.
@ -128,7 +126,7 @@ impl AudioBuffer {
channel.set(ptr::null_mut()); channel.set(ptr::null_mut());
// Step 3. // Step 3.
(*self.shared_channels.lock().unwrap()).buffers[i] = channel_data; (*self.shared_channels.borrow_mut()).buffers[i] = channel_data;
// Step 4 will complete turning shared_channels // Step 4 will complete turning shared_channels
// data into js_channels ArrayBuffers in restore_js_channel_data. // data into js_channels ArrayBuffers in restore_js_channel_data.
@ -136,7 +134,7 @@ impl AudioBuffer {
self.js_channels.borrow_mut().clear(); self.js_channels.borrow_mut().clear();
Some(self.shared_channels.clone()) Some((*self.shared_channels.borrow()).clone())
} }
} }