diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2019-05-07 12:49:47 -0700 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2019-05-07 17:09:04 -0700 |
commit | a9ab13b279d8234a56c58a6907362c4f48dd6138 (patch) | |
tree | 30dbd456f915ba1340e2ad326ef1c9d9da2e7c81 /components/script/dom/mediadevices.rs | |
parent | 106cc4a1f7a9454e0f551d13806cf44a02bc32c9 (diff) | |
download | servo-a9ab13b279d8234a56c58a6907362c4f48dd6138.tar.gz servo-a9ab13b279d8234a56c58a6907362c4f48dd6138.zip |
Use MediaStreamTracks in MediaStreams
Diffstat (limited to 'components/script/dom/mediadevices.rs')
-rw-r--r-- | components/script/dom/mediadevices.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs index 0a4f00e2472..460d3b0fc2c 100644 --- a/components/script/dom/mediadevices.rs +++ b/components/script/dom/mediadevices.rs @@ -14,6 +14,7 @@ use crate::dom::bindings::root::DomRoot; use crate::dom::eventtarget::EventTarget; use crate::dom::globalscope::GlobalScope; use crate::dom::mediastream::MediaStream; +use crate::dom::mediastreamtrack::MediaStreamTrack; use crate::dom::promise::Promise; use dom_struct::dom_struct; use servo_media::streams::capture::{Constrain, ConstrainRange, MediaTrackConstraintSet}; @@ -51,18 +52,20 @@ impl MediaDevicesMethods for MediaDevices { InCompartment::Already(&in_compartment_proof), ); let media = ServoMedia::get().unwrap(); - let mut tracks = vec![]; + let stream = MediaStream::new(&self.global()); if let Some(constraints) = convert_constraints(&constraints.audio) { if let Some(audio) = media.create_audioinput_stream(constraints) { - tracks.push(audio) + let track = MediaStreamTrack::new(&self.global(), audio); + stream.add_track(&track); } } if let Some(constraints) = convert_constraints(&constraints.video) { if let Some(video) = media.create_videoinput_stream(constraints) { - tracks.push(video) + let track = MediaStreamTrack::new(&self.global(), video); + stream.add_track(&track); } } - let stream = MediaStream::new(&self.global(), tracks); + p.resolve_native(&stream); p } |