Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1259788 - Allow MediaStreamTrack::ForwardTrackContentsTo to take an explicit TrackID. r=jesup

Browse Source 
MozReview-Commit-ID: EqsRdVJVuWu

--HG--
extra : rebase_source : 0008e6da5a4f49acdd567c0a84e432687599453e
extra : source : 7403911293c523f9714a693b91f9cafe5f5b3234
This commit is contained in:
Andreas Pehrson 2016-07-06 10:37:28 +02:00
parent d95d7de7da
commit ba31cb2444
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/media/MediaStreamTrack.cpp
View File

@ -479,12 +479,13 @@ MediaStreamTrack::RemoveDirectListener(DirectMediaStreamTrackListener *aListener
} }
already_AddRefed<MediaInputPort> already_AddRefed<MediaInputPort>
MediaStreamTrack::ForwardTrackContentsTo(ProcessedMediaStream* aStream) MediaStreamTrack::ForwardTrackContentsTo(ProcessedMediaStream* aStream,
TrackID aDestinationTrackID)
{ {
MOZ_ASSERT(NS_IsMainThread()); MOZ_ASSERT(NS_IsMainThread());
MOZ_RELEASE_ASSERT(aStream); MOZ_RELEASE_ASSERT(aStream);
RefPtr<MediaInputPort> port = RefPtr<MediaInputPort> port =
aStream->AllocateInputPort(GetOwnedStream(), mTrackID); aStream->AllocateInputPort(GetOwnedStream(), mTrackID, aDestinationTrackID);
return port.forget(); return port.forget();
} }

3
dom/media/MediaStreamTrack.h
View File

@ -388,7 +388,8 @@ public:
* Sets up a MediaInputPort from the underlying track that this * Sets up a MediaInputPort from the underlying track that this
* MediaStreamTrack represents, to aStream, and returns it. * MediaStreamTrack represents, to aStream, and returns it.
*/ */
already_AddRefed<MediaInputPort> ForwardTrackContentsTo(ProcessedMediaStream* aStream); already_AddRefed<MediaInputPort> ForwardTrackContentsTo(ProcessedMediaStream* aStream,
TrackID aDestinationTrackID = TRACK_ANY);
/** /**
* Returns true if this track is connected to aPort and forwarded to aPort's * Returns true if this track is connected to aPort and forwarded to aPort's