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

Auto merge of #22872 - Manishearth:mediaup, r=asajeffrey

Browse source 
Update servo-media

Pulls in https://github.com/servo/media/pull/199, doesn't use it yet

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22872)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-02-13 13:05:11 -05:00 • committed by GitHub
commit 093a1ee365
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/bindings/trace.rs
View file

@ -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;

4
components/script/dom/mediadevices.rs
View file

@ -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)
}
}

2
components/script/dom/mediastream.rs
View file

@ -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]

2
components/script/dom/rtcpeerconnection.rs
View file

@ -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,
};