Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update servo-media #22872

Merged
merged 1 commit into from Feb 13, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Some generated files are not rendered by default. Learn more.

@@ -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;
@@ -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)
}
}
@@ -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]
@@ -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,
};
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.