diff --git a/Cargo.lock b/Cargo.lock index 3dbac8ae545..92f867bd34e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3694,18 +3694,19 @@ dependencies = [ [[package]] name = "servo-media" version = "0.1.0" -source = "git+https://github.com/servo/media#593fcabd749e693de51d609688d29497c668c667" +source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" dependencies = [ "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", "servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)", "servo-media-player 0.1.0 (git+https://github.com/servo/media)", + "servo-media-streams 0.1.0 (git+https://github.com/servo/media)", "servo-media-webrtc 0.1.0 (git+https://github.com/servo/media)", ] [[package]] name = "servo-media-audio" version = "0.1.0" -source = "git+https://github.com/servo/media#593fcabd749e693de51d609688d29497c668c667" +source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3722,7 +3723,7 @@ dependencies = [ [[package]] name = "servo-media-gstreamer" version = "0.1.0" -source = "git+https://github.com/servo/media#593fcabd749e693de51d609688d29497c668c667" +source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3744,6 +3745,7 @@ dependencies = [ "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", "servo-media-player 0.1.0 (git+https://github.com/servo/media)", + "servo-media-streams 0.1.0 (git+https://github.com/servo/media)", "servo-media-webrtc 0.1.0 (git+https://github.com/servo/media)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "zip 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3752,19 +3754,25 @@ dependencies = [ [[package]] name = "servo-media-player" version = "0.1.0" -source = "git+https://github.com/servo/media#593fcabd749e693de51d609688d29497c668c667" +source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" dependencies = [ "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "servo-media-streams" +version = "0.1.0" +source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" + [[package]] name = "servo-media-webrtc" version = "0.1.0" -source = "git+https://github.com/servo/media#593fcabd749e693de51d609688d29497c668c667" +source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-media-streams 0.1.0 (git+https://github.com/servo/media)", ] [[package]] @@ -3847,7 +3855,7 @@ dependencies = [ [[package]] name = "servo_media_derive" version = "0.1.0" -source = "git+https://github.com/servo/media#593fcabd749e693de51d609688d29497c668c667" +source = "git+https://github.com/servo/media#4e2602b5154c0272703a88396fd3b286d34213e4" dependencies = [ "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5350,6 +5358,7 @@ dependencies = [ "checksum servo-media-audio 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-player 0.1.0 (git+https://github.com/servo/media)" = "" +"checksum servo-media-streams 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-media-webrtc 0.1.0 (git+https://github.com/servo/media)" = "" "checksum servo-skia 0.30000020.1 (registry+https://github.com/rust-lang/crates.io-index)" = "63abd6bed50aaf0e348d9fe8104088d61d5b67fd47cbbdc822278f5bed82b5f5" "checksum servo_media_derive 0.1.0 (git+https://github.com/servo/media)" = "" diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 3e20fab1dcf..115ea0d4b28 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -101,7 +101,8 @@ use servo_media::audio::graph::NodeId; use servo_media::audio::panner_node::{DistanceModel, PanningModel}; use servo_media::audio::param::ParamType; use servo_media::player::Player; -use servo_media::webrtc::{MediaStream as BackendMediaStream, WebRtcController}; +use servo_media::streams::MediaStream as BackendMediaStream; +use servo_media::webrtc::WebRtcController; use servo_media::Backend; use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl}; use smallvec::SmallVec; diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs index e018087a86c..60b99c7fb23 100644 --- a/components/script/dom/mediadevices.rs +++ b/components/script/dom/mediadevices.rs @@ -43,12 +43,12 @@ impl MediaDevicesMethods for MediaDevices { let media = ServoMedia::get().unwrap(); let mut tracks = vec![]; if constraints.audio { - if let Some(audio) = media.create_audioinput_stream() { + if let Some(audio) = media.create_audioinput_stream(Default::default()) { tracks.push(audio) } } if constraints.video { - if let Some(video) = media.create_videoinput_stream() { + if let Some(video) = media.create_videoinput_stream(Default::default()) { tracks.push(video) } } diff --git a/components/script/dom/mediastream.rs b/components/script/dom/mediastream.rs index 49550c97521..787c266637a 100644 --- a/components/script/dom/mediastream.rs +++ b/components/script/dom/mediastream.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::root::DomRoot; use crate::dom::eventtarget::EventTarget; use crate::dom::globalscope::GlobalScope; use dom_struct::dom_struct; -use servo_media::webrtc::MediaStream as BackendMediaStream; +use servo_media::streams::MediaStream as BackendMediaStream; use std::mem; #[dom_struct] diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs index 619721ca307..eb94914e588 100644 --- a/components/script/dom/rtcpeerconnection.rs +++ b/components/script/dom/rtcpeerconnection.rs @@ -34,7 +34,7 @@ use crate::task_source::networking::NetworkingTaskSource; use crate::task_source::TaskSource; use dom_struct::dom_struct; -use servo_media::webrtc::MediaStream as BackendMediaStream; +use servo_media::streams::MediaStream as BackendMediaStream; use servo_media::webrtc::{ BundlePolicy, IceCandidate, SdpType, SessionDescription, WebRtcController, WebRtcSignaller, };