mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Auto merge of #24687 - ferjm:mediaelementaudionode, r=Manishearth
WebAudio MediaElementAudioSourceNode implementation - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #22370 - [X] There are tests for these changes Depends on https://github.com/servo/media/pull/321 Tested with https://ferjm.github.io/webaudio-examples/media-source-buffer/ I am still investigating why it is playing back with a low rate.
This commit is contained in:
bors-servo
GitHub
commit
03a6fe0b1f
12 changed files with 179 additions and 147 deletions
23
Cargo.lock
generated
23
Cargo.lock
generated
|
|
@ -4446,7 +4446,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo-media"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"servo-media-audio",
|
||||
"servo-media-player",
|
||||
|
|
@ -4458,7 +4458,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo-media-audio"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"boxfnonce",
|
||||
"byte-slice-cast",
|
||||
|
|
@ -4467,6 +4467,7 @@ dependencies = [
|
|||
"petgraph",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"servo-media-player",
|
||||
"servo-media-traits",
|
||||
"servo_media_derive",
|
||||
"smallvec",
|
||||
|
|
@ -4490,7 +4491,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo-media-gstreamer"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"boxfnonce",
|
||||
"byte-slice-cast",
|
||||
|
|
@ -4526,7 +4527,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo-media-gstreamer-render"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"gstreamer",
|
||||
"gstreamer-video",
|
||||
|
|
@ -4536,7 +4537,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo-media-gstreamer-render-android"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"glib",
|
||||
"gstreamer",
|
||||
|
|
@ -4549,7 +4550,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo-media-gstreamer-render-unix"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"glib",
|
||||
"gstreamer",
|
||||
|
|
@ -4562,7 +4563,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo-media-player"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"ipc-channel",
|
||||
"serde",
|
||||
|
|
@ -4574,7 +4575,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo-media-streams"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"lazy_static",
|
||||
"uuid",
|
||||
|
|
@ -4583,12 +4584,12 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo-media-traits"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
|
||||
[[package]]
|
||||
name = "servo-media-webrtc"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"boxfnonce",
|
||||
"log",
|
||||
|
|
@ -4685,7 +4686,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "servo_media_derive"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/media#5380170bb42286ce9009d83e1034904bea8f00ee"
|
||||
source = "git+https://github.com/servo/media#220ed1388f2ba008b05f5e94aca21dd14aa37290"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.1",
|
||||
"quote 1.0.2",
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ use crate::dom::bindings::num::Finite;
|
|||
use crate::dom::bindings::refcounted::{Trusted, TrustedPromise};
|
||||
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject};
|
||||
use crate::dom::bindings::root::DomRoot;
|
||||
use crate::dom::htmlmediaelement::HTMLMediaElement;
|
||||
use crate::dom::mediaelementaudiosourcenode::MediaElementAudioSourceNode;
|
||||
use crate::dom::promise::Promise;
|
||||
use crate::dom::window::Window;
|
||||
use crate::task_source::TaskSource;
|
||||
|
|
@ -97,6 +99,10 @@ impl AudioContext {
|
|||
self.context.resume();
|
||||
}
|
||||
}
|
||||
|
||||
pub fn base(&self) -> DomRoot<BaseAudioContext> {
|
||||
DomRoot::from_ref(&self.context)
|
||||
}
|
||||
}
|
||||
|
||||
impl AudioContextMethods for AudioContext {
|
||||
|
|
@ -240,6 +246,16 @@ impl AudioContextMethods for AudioContext {
|
|||
// Step 6.
|
||||
promise
|
||||
}
|
||||
|
||||
/// https://webaudio.github.io/web-audio-api/#dom-audiocontext-createmediaelementsource
|
||||
fn CreateMediaElementSource(
|
||||
&self,
|
||||
media_element: &HTMLMediaElement,
|
||||
) -> Fallible<DomRoot<MediaElementAudioSourceNode>> {
|
||||
let global = self.global();
|
||||
let window = global.as_window();
|
||||
MediaElementAudioSourceNode::new(window, self, media_element)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<AudioContextLatencyCategory> for LatencyCategory {
|
||||
|
|
|
|||
|
|
@ -107,7 +107,8 @@ use servo_media::audio::context::AudioContext;
|
|||
use servo_media::audio::graph::NodeId;
|
||||
use servo_media::audio::panner_node::{DistanceModel, PanningModel};
|
||||
use servo_media::audio::param::ParamType;
|
||||
use servo_media::player::frame::Frame;
|
||||
use servo_media::player::audio::AudioRenderer;
|
||||
use servo_media::player::video::VideoFrame;
|
||||
use servo_media::player::Player;
|
||||
use servo_media::streams::registry::MediaStreamId;
|
||||
use servo_media::streams::MediaStreamType;
|
||||
|
|
@ -532,8 +533,9 @@ unsafe_no_jsmanaged_fields!(Point2D<f32>, Rect<Au>);
|
|||
unsafe_no_jsmanaged_fields!(Rect<f32>);
|
||||
unsafe_no_jsmanaged_fields!(CascadeData);
|
||||
unsafe_no_jsmanaged_fields!(WindowGLContext);
|
||||
unsafe_no_jsmanaged_fields!(Frame);
|
||||
unsafe_no_jsmanaged_fields!(VideoFrame);
|
||||
unsafe_no_jsmanaged_fields!(WebGLContextId);
|
||||
unsafe_no_jsmanaged_fields!(Arc<Mutex<dyn AudioRenderer>>);
|
||||
|
||||
unsafe impl<'a> JSTraceable for &'a str {
|
||||
#[inline]
|
||||
|
|
|
|||
|
|
@ -79,7 +79,8 @@ use net_traits::{CoreResourceMsg, FetchChannels, FetchMetadata, FetchResponseLis
|
|||
use net_traits::{NetworkError, ResourceFetchTiming, ResourceTimingType};
|
||||
use script_layout_interface::HTMLMediaData;
|
||||
use servo_config::pref;
|
||||
use servo_media::player::frame::{Frame, FrameRenderer};
|
||||
use servo_media::player::audio::AudioRenderer;
|
||||
use servo_media::player::video::{VideoFrame, VideoFrameRenderer};
|
||||
use servo_media::player::{PlaybackState, Player, PlayerError, PlayerEvent, SeekLock, StreamType};
|
||||
use servo_media::{ClientContextId, ServoMedia, SupportsMediaType};
|
||||
use servo_url::ServoUrl;
|
||||
|
|
@ -100,10 +101,10 @@ enum FrameStatus {
|
|||
Unlocked,
|
||||
}
|
||||
|
||||
struct FrameHolder(FrameStatus, Frame);
|
||||
struct FrameHolder(FrameStatus, VideoFrame);
|
||||
|
||||
impl FrameHolder {
|
||||
fn new(frame: Frame) -> FrameHolder {
|
||||
fn new(frame: VideoFrame) -> FrameHolder {
|
||||
FrameHolder(FrameStatus::Unlocked, frame)
|
||||
}
|
||||
|
||||
|
|
@ -119,7 +120,7 @@ impl FrameHolder {
|
|||
};
|
||||
}
|
||||
|
||||
fn set(&mut self, new_frame: Frame) {
|
||||
fn set(&mut self, new_frame: VideoFrame) {
|
||||
if self.0 == FrameStatus::Unlocked {
|
||||
self.1 = new_frame
|
||||
};
|
||||
|
|
@ -137,7 +138,7 @@ impl FrameHolder {
|
|||
}
|
||||
}
|
||||
|
||||
fn get_frame(&self) -> Frame {
|
||||
fn get_frame(&self) -> VideoFrame {
|
||||
self.1.clone()
|
||||
}
|
||||
}
|
||||
|
|
@ -170,8 +171,8 @@ impl MediaFrameRenderer {
|
|||
}
|
||||
}
|
||||
|
||||
impl FrameRenderer for MediaFrameRenderer {
|
||||
fn render(&mut self, frame: Frame) {
|
||||
impl VideoFrameRenderer for MediaFrameRenderer {
|
||||
fn render(&mut self, frame: VideoFrame) {
|
||||
let mut txn = Transaction::new();
|
||||
|
||||
if let Some(old_image_key) = mem::replace(&mut self.very_old_frame, self.old_frame.take()) {
|
||||
|
|
@ -325,7 +326,9 @@ pub struct HTMLMediaElement {
|
|||
#[ignore_malloc_size_of = "servo_media"]
|
||||
player: DomRefCell<Option<Arc<Mutex<dyn Player>>>>,
|
||||
#[ignore_malloc_size_of = "Arc"]
|
||||
frame_renderer: Arc<Mutex<MediaFrameRenderer>>,
|
||||
video_renderer: Arc<Mutex<MediaFrameRenderer>>,
|
||||
#[ignore_malloc_size_of = "Arc"]
|
||||
audio_renderer: DomRefCell<Option<Arc<Mutex<dyn AudioRenderer>>>>,
|
||||
/// https://html.spec.whatwg.org/multipage/#show-poster-flag
|
||||
show_poster: Cell<bool>,
|
||||
/// https://html.spec.whatwg.org/multipage/#dom-media-duration
|
||||
|
|
@ -410,9 +413,10 @@ impl HTMLMediaElement {
|
|||
pending_play_promises: Default::default(),
|
||||
in_flight_play_promises_queue: Default::default(),
|
||||
player: Default::default(),
|
||||
frame_renderer: Arc::new(Mutex::new(MediaFrameRenderer::new(
|
||||
video_renderer: Arc::new(Mutex::new(MediaFrameRenderer::new(
|
||||
document.window().get_webrender_api_sender(),
|
||||
))),
|
||||
audio_renderer: Default::default(),
|
||||
show_poster: Cell::new(true),
|
||||
duration: Cell::new(f64::NAN),
|
||||
playback_position: Cell::new(0.),
|
||||
|
|
@ -1293,7 +1297,7 @@ impl HTMLMediaElement {
|
|||
|
||||
// Step 6.
|
||||
if let ImageResponse::Loaded(image, _) = image {
|
||||
self.frame_renderer
|
||||
self.video_renderer
|
||||
.lock()
|
||||
.unwrap()
|
||||
.render_poster_frame(image);
|
||||
|
|
@ -1325,11 +1329,14 @@ impl HTMLMediaElement {
|
|||
|
||||
let window = window_from_node(self);
|
||||
let (action_sender, action_receiver) = ipc::channel::<PlayerEvent>().unwrap();
|
||||
let renderer: Option<Arc<Mutex<dyn FrameRenderer>>> = match self.media_type_id() {
|
||||
let video_renderer: Option<Arc<Mutex<dyn VideoFrameRenderer>>> = match self.media_type_id()
|
||||
{
|
||||
HTMLMediaElementTypeId::HTMLAudioElement => None,
|
||||
HTMLMediaElementTypeId::HTMLVideoElement => Some(self.frame_renderer.clone()),
|
||||
HTMLMediaElementTypeId::HTMLVideoElement => Some(self.video_renderer.clone()),
|
||||
};
|
||||
|
||||
let audio_renderer = self.audio_renderer.borrow().as_ref().map(|r| r.clone());
|
||||
|
||||
let pipeline_id = window
|
||||
.pipeline_id()
|
||||
.expect("Cannot create player outside of a pipeline");
|
||||
|
|
@ -1339,7 +1346,8 @@ impl HTMLMediaElement {
|
|||
&client_context_id,
|
||||
stream_type,
|
||||
action_sender,
|
||||
renderer,
|
||||
video_renderer,
|
||||
audio_renderer,
|
||||
Box::new(window.get_player_context()),
|
||||
);
|
||||
|
||||
|
|
@ -1385,7 +1393,7 @@ impl HTMLMediaElement {
|
|||
.unwrap_or((0, None));
|
||||
|
||||
self.id.set(player_id);
|
||||
self.frame_renderer.lock().unwrap().player_id = Some(player_id);
|
||||
self.video_renderer.lock().unwrap().player_id = Some(player_id);
|
||||
|
||||
if let Some(image_receiver) = image_receiver {
|
||||
let trusted_node = Trusted::new(self);
|
||||
|
|
@ -1400,11 +1408,11 @@ impl HTMLMediaElement {
|
|||
if let Err(err) = task_source.queue_with_canceller(
|
||||
task!(handle_glplayer_message: move || {
|
||||
trace!("GLPlayer message {:?}", msg);
|
||||
let frame_renderer = this.root().frame_renderer.clone();
|
||||
let video_renderer = this.root().video_renderer.clone();
|
||||
|
||||
match msg {
|
||||
GLPlayerMsgForward::Lock(sender) => {
|
||||
frame_renderer
|
||||
video_renderer
|
||||
.lock()
|
||||
.unwrap()
|
||||
.current_frame_holder
|
||||
|
|
@ -1415,7 +1423,7 @@ impl HTMLMediaElement {
|
|||
});
|
||||
},
|
||||
GLPlayerMsgForward::Unlock() => {
|
||||
frame_renderer
|
||||
video_renderer
|
||||
.lock()
|
||||
.unwrap()
|
||||
.current_frame_holder
|
||||
|
|
@ -1527,7 +1535,7 @@ impl HTMLMediaElement {
|
|||
)));
|
||||
self.upcast::<EventTarget>().fire_event(atom!("error"));
|
||||
},
|
||||
PlayerEvent::FrameUpdated => {
|
||||
PlayerEvent::VideoFrameUpdated => {
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
},
|
||||
PlayerEvent::MetadataUpdated(ref metadata) => {
|
||||
|
|
@ -1855,12 +1863,26 @@ impl HTMLMediaElement {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn get_current_frame(&self) -> Option<Frame> {
|
||||
match self.frame_renderer.lock().unwrap().current_frame_holder {
|
||||
pub fn get_current_frame(&self) -> Option<VideoFrame> {
|
||||
match self.video_renderer.lock().unwrap().current_frame_holder {
|
||||
Some(ref holder) => Some(holder.get_frame()),
|
||||
None => return None,
|
||||
}
|
||||
}
|
||||
|
||||
/// By default the audio is rendered through the audio sink automatically
|
||||
/// selected by the servo-media Player instance. However, in some cases, like
|
||||
/// the WebAudio MediaElementAudioSourceNode, we need to set a custom audio
|
||||
/// renderer.
|
||||
pub fn set_audio_renderer(&self, audio_renderer: Arc<Mutex<dyn AudioRenderer>>) {
|
||||
*self.audio_renderer.borrow_mut() = Some(audio_renderer);
|
||||
if let Some(ref player) = *self.player.borrow() {
|
||||
if let Err(e) = player.lock().unwrap().stop() {
|
||||
eprintln!("Could not stop player {:?}", e);
|
||||
}
|
||||
self.media_element_load_algorithm();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// XXX Placeholder for [https://github.com/servo/servo/issues/22293]
|
||||
|
|
@ -2365,7 +2387,7 @@ impl LayoutHTMLMediaElementHelpers for LayoutDom<HTMLMediaElement> {
|
|||
fn data(&self) -> HTMLMediaData {
|
||||
let media = unsafe { &*self.unsafe_get() };
|
||||
HTMLMediaData {
|
||||
current_frame: media.frame_renderer.lock().unwrap().current_frame.clone(),
|
||||
current_frame: media.video_renderer.lock().unwrap().current_frame.clone(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ use net_traits::{
|
|||
CoreResourceMsg, FetchChannels, FetchMetadata, FetchResponseListener, FetchResponseMsg,
|
||||
};
|
||||
use net_traits::{NetworkError, ResourceFetchTiming, ResourceTimingType};
|
||||
use servo_media::player::frame::Frame;
|
||||
use servo_media::player::video::VideoFrame;
|
||||
use servo_url::ServoUrl;
|
||||
use std::cell::Cell;
|
||||
use std::sync::{Arc, Mutex};
|
||||
|
|
@ -58,8 +58,8 @@ pub struct HTMLVideoElement {
|
|||
/// is being fetched.
|
||||
load_blocker: DomRefCell<Option<LoadBlocker>>,
|
||||
/// A copy of the last frame
|
||||
#[ignore_malloc_size_of = "Frame"]
|
||||
last_frame: DomRefCell<Option<Frame>>,
|
||||
#[ignore_malloc_size_of = "VideoFrame"]
|
||||
last_frame: DomRefCell<Option<VideoFrame>>,
|
||||
}
|
||||
|
||||
impl HTMLVideoElement {
|
||||
|
|
|
|||
80
components/script/dom/mediaelementaudiosourcenode.rs
Normal file
80
components/script/dom/mediaelementaudiosourcenode.rs
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use crate::dom::audiocontext::AudioContext;
|
||||
use crate::dom::audionode::AudioNode;
|
||||
use crate::dom::bindings::codegen::Bindings::MediaElementAudioSourceNodeBinding;
|
||||
use crate::dom::bindings::codegen::Bindings::MediaElementAudioSourceNodeBinding::MediaElementAudioSourceNodeMethods;
|
||||
use crate::dom::bindings::codegen::Bindings::MediaElementAudioSourceNodeBinding::MediaElementAudioSourceOptions;
|
||||
use crate::dom::bindings::error::Fallible;
|
||||
use crate::dom::bindings::reflector::reflect_dom_object;
|
||||
use crate::dom::bindings::root::{Dom, DomRoot};
|
||||
use crate::dom::htmlmediaelement::HTMLMediaElement;
|
||||
use crate::dom::window::Window;
|
||||
use dom_struct::dom_struct;
|
||||
use servo_media::audio::media_element_source_node::MediaElementSourceNodeMessage;
|
||||
use servo_media::audio::node::{AudioNodeInit, AudioNodeMessage};
|
||||
use std::sync::mpsc;
|
||||
|
||||
#[dom_struct]
|
||||
pub struct MediaElementAudioSourceNode {
|
||||
node: AudioNode,
|
||||
media_element: Dom<HTMLMediaElement>,
|
||||
}
|
||||
|
||||
impl MediaElementAudioSourceNode {
|
||||
#[allow(unrooted_must_root)]
|
||||
fn new_inherited(
|
||||
context: &AudioContext,
|
||||
media_element: &HTMLMediaElement,
|
||||
) -> Fallible<MediaElementAudioSourceNode> {
|
||||
let node = AudioNode::new_inherited(
|
||||
AudioNodeInit::MediaElementSourceNode,
|
||||
&*context.base(),
|
||||
Default::default(),
|
||||
0,
|
||||
1,
|
||||
)?;
|
||||
let (sender, receiver) = mpsc::channel();
|
||||
node.message(AudioNodeMessage::MediaElementSourceNode(
|
||||
MediaElementSourceNodeMessage::GetAudioRenderer(sender),
|
||||
));
|
||||
let audio_renderer = receiver.recv().unwrap();
|
||||
media_element.set_audio_renderer(audio_renderer);
|
||||
let media_element = Dom::from_ref(media_element);
|
||||
Ok(MediaElementAudioSourceNode {
|
||||
node,
|
||||
media_element,
|
||||
})
|
||||
}
|
||||
|
||||
#[allow(unrooted_must_root)]
|
||||
pub fn new(
|
||||
window: &Window,
|
||||
context: &AudioContext,
|
||||
media_element: &HTMLMediaElement,
|
||||
) -> Fallible<DomRoot<MediaElementAudioSourceNode>> {
|
||||
let node = MediaElementAudioSourceNode::new_inherited(context, media_element)?;
|
||||
Ok(reflect_dom_object(
|
||||
Box::new(node),
|
||||
window,
|
||||
MediaElementAudioSourceNodeBinding::Wrap,
|
||||
))
|
||||
}
|
||||
|
||||
pub fn Constructor(
|
||||
window: &Window,
|
||||
context: &AudioContext,
|
||||
options: &MediaElementAudioSourceOptions,
|
||||
) -> Fallible<DomRoot<MediaElementAudioSourceNode>> {
|
||||
MediaElementAudioSourceNode::new(window, context, &*options.mediaElement)
|
||||
}
|
||||
}
|
||||
|
||||
impl MediaElementAudioSourceNodeMethods for MediaElementAudioSourceNode {
|
||||
/// https://webaudio.github.io/web-audio-api/#dom-mediaelementaudiosourcenode-mediaelement
|
||||
fn MediaElement(&self) -> DomRoot<HTMLMediaElement> {
|
||||
DomRoot::from_ref(&*self.media_element)
|
||||
}
|
||||
}
|
||||
|
|
@ -394,6 +394,7 @@ pub mod inputevent;
|
|||
pub mod keyboardevent;
|
||||
pub mod location;
|
||||
pub mod mediadevices;
|
||||
pub mod mediaelementaudiosourcenode;
|
||||
pub mod mediaerror;
|
||||
pub mod mediafragmentparser;
|
||||
pub mod medialist;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ interface AudioContext : BaseAudioContext {
|
|||
Promise<void> suspend();
|
||||
Promise<void> close();
|
||||
|
||||
// MediaElementAudioSourceNode createMediaElementSource(HTMLMediaElement mediaElement);
|
||||
[Throws] MediaElementAudioSourceNode createMediaElementSource(HTMLMediaElement mediaElement);
|
||||
// MediaStreamAudioSourceNode createMediaStreamSource(MediaStream mediaStream);
|
||||
// MediaStreamTrackAudioSourceNode createMediaStreamTrackSource(MediaStreamTrack mediaStreamTrack);
|
||||
// MediaStreamAudioDestinationNode createMediaStreamDestination();
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
/*
|
||||
* The origin of this IDL file is
|
||||
* https://webaudio.github.io/web-audio-api/#mediaelementaudiosourcenode
|
||||
*/
|
||||
|
||||
dictionary MediaElementAudioSourceOptions {
|
||||
required HTMLMediaElement mediaElement;
|
||||
};
|
||||
|
||||
[Exposed=Window]
|
||||
interface MediaElementAudioSourceNode : AudioNode {
|
||||
[Throws] constructor (AudioContext context, MediaElementAudioSourceOptions options);
|
||||
[SameObject] readonly attribute HTMLMediaElement mediaElement;
|
||||
};
|
||||
|
|
@ -2,9 +2,6 @@
|
|||
[AudioNode interface: calling connect(AudioNode, unsigned long, unsigned long) on new ConvolverNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "disconnect(AudioParam)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[ConvolverNode interface: existence and properties of interface prototype object's @@unscopables property]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -38,9 +35,6 @@
|
|||
[ScriptProcessorNode interface: context.createScriptProcessor() must inherit property "onaudioprocess" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[MediaElementAudioSourceNode interface: existence and properties of interface prototype object's @@unscopables property]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: worklet_node must inherit property "disconnect(AudioParam, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -59,15 +53,9 @@
|
|||
[AudioNode interface: calling disconnect(AudioNode) on new WaveShaperNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "disconnect(AudioNode)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: context.createScriptProcessor() must inherit property "disconnect()" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "disconnect(AudioNode, unsigned long, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaStreamAudioDestinationNode(context) must inherit property "context" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -116,9 +104,6 @@
|
|||
[AudioNode interface: calling connect(AudioParam, unsigned long) on new ConvolverNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "connect(AudioNode, unsigned long, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[OscillatorNode interface: operation setPeriodicWave(PeriodicWave)]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -179,15 +164,9 @@
|
|||
[AudioProcessingEvent interface: existence and properties of interface object]
|
||||
expected: FAIL
|
||||
|
||||
[AudioContext interface: operation createMediaElementSource(HTMLMediaElement)]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(AudioNode, unsigned long) on new DynamicsCompressorNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling connect(AudioParam, unsigned long) on new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[BaseAudioContext interface: operation createPeriodicWave([object Object\], [object Object\], PeriodicWaveConstraints)]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -197,9 +176,6 @@
|
|||
[ScriptProcessorNode interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[AudioContext interface: calling createMediaElementSource(HTMLMediaElement) on context with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling connect(AudioNode, unsigned long, unsigned long) on new DynamicsCompressorNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -233,9 +209,6 @@
|
|||
[AudioNode interface: new DynamicsCompressorNode(context) must inherit property "channelCount" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "channelCountMode" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling connect(AudioParam, unsigned long) on new DelayNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -257,9 +230,6 @@
|
|||
[AudioNode interface: new DynamicsCompressorNode(context) must inherit property "disconnect(AudioNode, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(unsigned long) on new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[IIRFilterNode interface: operation getFrequencyResponse(Float32Array, Float32Array, Float32Array)]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -305,9 +275,6 @@
|
|||
[MediaStreamAudioSourceNode interface object length]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(AudioParam) on new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioWorklet interface object name]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -317,9 +284,6 @@
|
|||
[AudioNode interface: context.createScriptProcessor() must inherit property "disconnect(AudioParam, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[MediaElementAudioSourceNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "mediaElement" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[BaseAudioContext interface: operation decodeAudioData(ArrayBuffer, DecodeSuccessCallback, DecodeErrorCallback)]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -335,15 +299,6 @@
|
|||
[StereoPannerNode interface: existence and properties of interface object]
|
||||
expected: FAIL
|
||||
|
||||
[MediaElementAudioSourceNode interface: existence and properties of interface object]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling connect(AudioNode, unsigned long, unsigned long) on new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "disconnect()" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[MediaStreamAudioSourceNode interface: existence and properties of interface prototype object's "constructor" property]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -419,9 +374,6 @@
|
|||
[AudioNode interface: worklet_node must inherit property "disconnect()" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "numberOfInputs" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[BaseAudioContext interface: attribute audioWorklet]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -455,21 +407,12 @@
|
|||
[DelayNode interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(AudioNode, unsigned long, unsigned long) on new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[DynamicsCompressorNode interface: existence and properties of interface prototype object's @@unscopables property]
|
||||
expected: FAIL
|
||||
|
||||
[MediaStreamAudioSourceNode interface: existence and properties of interface object]
|
||||
expected: FAIL
|
||||
|
||||
[MediaElementAudioSourceNode interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(AudioParam, unsigned long) on new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new DynamicsCompressorNode(context) must inherit property "disconnect(AudioParam, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -479,9 +422,6 @@
|
|||
[AudioNode interface: new MediaStreamAudioDestinationNode(context) must inherit property "channelCountMode" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[MediaElementAudioSourceNode interface object length]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new WaveShaperNode(context) must inherit property "disconnect(AudioParam, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -515,9 +455,6 @@
|
|||
[AudioProcessingEvent interface: attribute outputBuffer]
|
||||
expected: FAIL
|
||||
|
||||
[AudioContext interface: context must inherit property "createMediaElementSource(HTMLMediaElement)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioProcessingEvent interface object length]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -605,9 +542,6 @@
|
|||
[MediaStreamAudioDestinationNode interface: existence and properties of interface prototype object's "constructor" property]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "channelInterpretation" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[BaseAudioContext interface: operation createIIRFilter([object Object\], [object Object\])]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -620,15 +554,9 @@
|
|||
[AudioNode interface: calling disconnect(AudioNode, unsigned long, unsigned long) on new ConvolverNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(AudioNode, unsigned long) on new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new DynamicsCompressorNode(context) must inherit property "disconnect(AudioParam)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "disconnect(AudioNode, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioWorkletNode must be primary interface of worklet_node]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -659,9 +587,6 @@
|
|||
[BaseAudioContext interface: context must inherit property "createScriptProcessor(unsigned long, unsigned long, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "context" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(AudioParam, unsigned long) on new DelayNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -716,9 +641,6 @@
|
|||
[ConvolverNode interface: attribute buffer]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(AudioNode) on new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new WaveShaperNode(context) must inherit property "disconnect(AudioNode)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -731,15 +653,9 @@
|
|||
[BaseAudioContext interface: calling createPeriodicWave([object Object\], [object Object\], PeriodicWaveConstraints) on new OfflineAudioContext(1, 1, sample_rate) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "disconnect(AudioParam, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(AudioParam, unsigned long) on new WaveShaperNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[MediaElementAudioSourceNode interface object name]
|
||||
expected: FAIL
|
||||
|
||||
[AudioProcessingEvent interface: attribute playbackTime]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -782,9 +698,6 @@
|
|||
[AudioNode interface: calling disconnect(AudioNode, unsigned long) on new MediaStreamAudioDestinationNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[MediaElementAudioSourceNode must be primary interface of new MediaElementAudioSourceNode(context, {mediaElement: new Audio})]
|
||||
expected: FAIL
|
||||
|
||||
[ScriptProcessorNode interface: attribute onaudioprocess]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -845,15 +758,9 @@
|
|||
[OscillatorNode interface: calling setPeriodicWave(PeriodicWave) on new OscillatorNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[MediaElementAudioSourceNode interface: existence and properties of interface prototype object's "constructor" property]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new DynamicsCompressorNode(context) must inherit property "disconnect()" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[Stringification of new MediaElementAudioSourceNode(context, {mediaElement: new Audio})]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: calling disconnect(AudioNode, unsigned long) on new DelayNode(context) with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -890,9 +797,6 @@
|
|||
[AudioNode interface: new ConvolverNode(context) must inherit property "disconnect(AudioParam)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "numberOfOutputs" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[DynamicsCompressorNode interface: attribute attack]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -923,9 +827,6 @@
|
|||
[BaseAudioContext interface: calling createScriptProcessor(unsigned long, unsigned long, unsigned long) on context with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[MediaElementAudioSourceNode interface: attribute mediaElement]
|
||||
expected: FAIL
|
||||
|
||||
[AudioWorklet interface: existence and properties of interface prototype object's @@unscopables property]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1013,9 +914,6 @@
|
|||
[DynamicsCompressorNode interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "channelCount" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new DelayNode(context) must inherit property "channelCountMode" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1055,9 +953,6 @@
|
|||
[AudioNode interface: new MediaStreamAudioDestinationNode(context) must inherit property "disconnect(AudioParam)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "connect(AudioParam, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new DelayNode(context) must inherit property "disconnect(AudioNode, unsigned long, unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1088,9 +983,6 @@
|
|||
[WaveShaperNode interface object name]
|
||||
expected: FAIL
|
||||
|
||||
[AudioNode interface: new MediaElementAudioSourceNode(context, {mediaElement: new Audio}) must inherit property "disconnect(unsigned long)" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
[BaseAudioContext interface: new OfflineAudioContext(1, 1, sample_rate) must inherit property "createDynamicsCompressor()" with the proper type]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -19023,7 +19023,7 @@
|
|||
"testharness"
|
||||
],
|
||||
"mozilla/interfaces.html": [
|
||||
"3578a6e01cc3bb6daf8b4942d672ecb7da1ff6b5",
|
||||
"4006cae2d79ba4ca21c229084fcb528b8a4156f1",
|
||||
"testharness"
|
||||
],
|
||||
"mozilla/interfaces.js": [
|
||||
|
|
|
|||
|
|
@ -163,6 +163,7 @@ test_interfaces([
|
|||
"InputEvent",
|
||||
"KeyboardEvent",
|
||||
"Location",
|
||||
"MediaElementAudioSourceNode",
|
||||
"MediaError",
|
||||
"MediaList",
|
||||
"MediaQueryList",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue