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

Do not copy initial data during AudioBuffer construction and use JS_DetachArrayBuffer

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-07-13 21:49:11 +02:00
parent 1649b6a528
commit 477907e578
1 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object};
use dom::bindings::root::DomRoot; use dom::bindings::root::DomRoot;
use dom::window::Window; use dom::window::Window;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use js::jsapi::{Heap, JSContext, JSObject, JS_StealArrayBufferContents}; use js::jsapi::{DetachDataDisposition, Heap, JSContext, JSObject, JS_DetachArrayBuffer};
use js::rust::CustomAutoRooterGuard; 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;
@ -42,26 +42,31 @@ impl AudioBuffer {
sample_rate: f32, sample_rate: f32,
initial_data: Option<&[f32]>, initial_data: Option<&[f32]>,
) -> AudioBuffer { ) -> AudioBuffer {
let initial_data = match initial_data {
Some(initial_data) => {
let mut data = vec![];
data.extend_from_slice(initial_data);
data
},
None => vec![0.; (length * number_of_channels) as usize],
};
let cx = global.get_cx(); let cx = global.get_cx();
let mut js_channels: Vec<JSAudioChannel> = Vec::with_capacity(number_of_channels as usize); let mut js_channels: Vec<JSAudioChannel> = Vec::with_capacity(number_of_channels as usize);
for channel in 0..number_of_channels { for channel in 0..number_of_channels {
rooted!(in (cx) let mut array = ptr::null_mut::<JSObject>()); rooted!(in (cx) let mut array = ptr::null_mut::<JSObject>());
let offset = (channel * length) as usize; let offset = (channel * length) as usize;
let _ = unsafe { match initial_data {
Float32Array::create( Some(data) => {
cx, let _ = unsafe {
CreateWith::Slice(&initial_data.as_slice()[offset..offset + (length as usize)]), Float32Array::create(
array.handle_mut(), cx,
) CreateWith::Slice(&data[offset..offset + (length as usize) - 1]),
}; array.handle_mut(),
)
};
},
None => {
let _ = unsafe {
Float32Array::create(
cx,
CreateWith::Slice(&vec![0.; length as usize]),
array.handle_mut(),
)
};
}
}
let js_channel = Heap::default(); let js_channel = Heap::default();
js_channel.set(array.get()); js_channel.set(array.get());
js_channels.push(js_channel); js_channels.push(js_channel);
@ -151,10 +156,8 @@ impl AudioBuffer {
let channel_data = unsafe { let channel_data = unsafe {
typedarray!(in(cx) let array: Float32Array = channel.get()); typedarray!(in(cx) let array: Float32Array = channel.get());
if let Ok(array) = array { if let Ok(array) = array {
// XXX TypedArrays API does not expose a way to steal the buffer's
// content.
let data = array.to_vec(); let data = array.to_vec();
let _ = JS_StealArrayBufferContents(cx, channel.handle()); let _ = JS_DetachArrayBuffer(cx, channel.handle(), DetachDataDisposition::KeepData);
data data
} else { } else {
return None; return None;