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

Bug 1208371 - Move FindTrack from SourceMediaStream to MediaStream. r=roc

Browse Source 
MozReview-Commit-ID: 2BzGdGdbpy0

--HG--
extra : rebase_source : f011fe75b86e0db80443f0042866678d438d6d63
This commit is contained in:
Andreas Pehrson 2016-01-21 19:25:25 +08:00
parent 312d19a45e
commit 849f97a6f3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/media/MediaStreamGraph.cpp
View File

@ -1950,6 +1950,12 @@ MediaStream::FinishOnGraphThread()
GraphImpl()->FinishStream(this);
}
StreamBuffer::Track*
MediaStream::FindTrack(TrackID aID)
{
return mBuffer.FindTrack(aID);
}
StreamBuffer::Track*
MediaStream::EnsureTrack(TrackID aTrackId)
{
@ -2582,12 +2588,6 @@ SourceMediaStream::FinishAddTracks()
}
}
StreamBuffer::Track*
SourceMediaStream::FindTrack(TrackID aID)
{
return mBuffer.FindTrack(aID);
}
void
SourceMediaStream::ResampleAudioToGraphSampleRate(TrackData* aTrackData, MediaSegment* aSegment)
{

10
dom/media/MediaStreamGraph.h
View File

@ -758,6 +758,11 @@ public:
bool HasCurrentData() { return mHasCurrentData; }
/**
* Find track by track id.
*/
StreamBuffer::Track* FindTrack(TrackID aID);
StreamBuffer::Track* EnsureTrack(TrackID aTrack);
virtual void ApplyTrackDisabling(TrackID aTrackID, MediaSegment* aSegment, MediaSegment* aRawSegment = nullptr);
@ -1000,11 +1005,6 @@ public:
*/
void FinishAddTracks();
/**
* Find track by track id.
*/
StreamBuffer::Track* FindTrack(TrackID aID);
/**
* Append media data to a track. Ownership of aSegment remains with the caller,
* but aSegment is emptied.