Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 04:35:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1246310 - Add a method for attaching local tracks rather than full streams. r=drno

Browse Source 
MozReview-Commit-ID: IdE7H1ItQTR

--HG--
extra : rebase_source : 1b47bcb898ee9df3a520b04e2379ac39cfd1654c
This commit is contained in:
Andreas Pehrson 2016-04-18 17:48:32 +02:00
parent 36a9cce5df
commit e26b844c15
1 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
dom/media/tests/mochitest/pc.js
View File

@ -712,6 +712,7 @@ function PeerConnectionWrapper(label, configuration) {
this.constraints = [ ];
this.offerOptions = {};
this.streams = [ ];
this.streamsForLocalTracks = [ ];
this.mediaElements = [ ];
this.dataChannels = [ ];
@ -820,6 +821,59 @@ PeerConnectionWrapper.prototype = {
this._pc.setIdentityProvider(provider, protocol, identity);
},
/**
* Attaches a local track to this RTCPeerConnection using
* RTCPeerConnection.addTrack().
*
* Also creates a media element playing a MediaStream containing all
* tracks that have been added to `stream` using `attachLocalTrack()`.
*
* @param {MediaStreamTrack} track
* MediaStreamTrack to handle
* @param {MediaStream} stream
* MediaStream to use as container for `track` on remote side
*/
attachLocalTrack : function(track, stream) {
info("Got a local " + track.kind + " track");
this.expectNegotiationNeeded();
var sender = this._pc.addTrack(track, stream);
is(sender.track, track, "addTrack returns sender");
ok(track.id, "track has id");
ok(track.kind, "track has kind");
ok(stream.id, "stream has id");
this.expectedLocalTrackInfoById[track.id] = {
type: track.kind,
streamId: stream.id,
};
var mappedStream =
this.streamsForLocalTracks.find(o => o.fromStreamId == stream.id);
if (mappedStream) {
mappedStream.stream.addTrack(track);
return this.observedNegotiationNeeded;
}
mappedStream = new MediaStream([track]);
this.streamsForLocalTracks.push(
{ fromStreamId: stream.id
, stream: mappedStream
}
);
var element = createMediaElement(track.kind, this.label + '_tracks_' + this.streamsForLocalTracks.length);
this.mediaElements.push(element);
element.srcObject = mappedStream;
element.play();
// Store local media elements so that we can stop them when done.
// Don't store remote ones because they should stop when the PC does.
this.localMediaElements.push(element);
return this.observedNegotiationNeeded;
},
/**
* Callback when we get media from either side. Also an appropriate
* HTML media element will be created.