Auto merge of #23157 - ferjm:gum.playback, r=Manishearth

MediaStream playback through audio and video elements

- [X] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] There are tests for these changes

<!-- 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/23157)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-04-13 20:28:17 -04:00 committed by GitHub
commit 17204544d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 110 additions and 63 deletions

View file

@ -35,7 +35,7 @@ use crate::task_source::networking::NetworkingTaskSource;
use crate::task_source::TaskSource;
use dom_struct::dom_struct;
use servo_media::streams::MediaStream as BackendMediaStream;
use servo_media::streams::registry::MediaStreamId;
use servo_media::webrtc::{
BundlePolicy, GatheringState, IceCandidate, IceConnectionState, SdpType, SessionDescription,
SignalingState, WebRtcController, WebRtcSignaller,
@ -128,7 +128,7 @@ impl WebRtcSignaller for RTCSignaller {
);
}
fn on_add_stream(&self, _: Box<BackendMediaStream>) {}
fn on_add_stream(&self, _: &MediaStreamId) {}
fn close(&self) {
// do nothing
@ -572,7 +572,7 @@ impl RTCPeerConnectionMethods for RTCPeerConnection {
fn AddStream(&self, stream: &MediaStream) {
let mut tracks = stream.get_tracks();
for track in tracks.drain(..) {
for ref track in tracks.drain(..) {
self.controller.borrow().as_ref().unwrap().add_stream(track);
}
}