wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1189506. Call StreamTimeToGraphTime in MediaStreamGraphImpl::UpdateCurrentTimeForStreams, since we know blocking has been taken account of already there. r=karlt

Browse Source
This commit is contained in:
Robert O'Callahan 2015-09-08 16:38:40 +12:00
parent 19674bbb97
commit fc061439e6
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/media/MediaStreamGraph.cpp
View File

@ -302,7 +302,7 @@ MediaStreamGraphImpl::UpdateCurrentTimeForStreams(GraphTime aPrevCurrentTime)
// out.
if (stream->mFinished && !stream->mNotifiedFinished &&
mProcessedTime >=
stream->StreamTimeToGraphTimeWithBlocking(stream->GetStreamBuffer().GetAllTracksEnd())) {
stream->StreamTimeToGraphTime(stream->GetStreamBuffer().GetAllTracksEnd())) {
stream->mNotifiedFinished = true;
SetStreamOrderDirty();
for (uint32_t j = 0; j < stream->mListeners.Length(); ++j) {
@ -1709,12 +1709,6 @@ MediaStream::GraphTimeToStreamTimeWithBlocking(GraphTime aTime)
return GraphImpl()->GraphTimeToStreamTimeWithBlocking(this, aTime);
}
GraphTime
MediaStream::StreamTimeToGraphTimeWithBlocking(StreamTime aTime)
{
return GraphImpl()->StreamTimeToGraphTimeWithBlocking(this, aTime);
}
void
MediaStream::FinishOnGraphThread()
{

6
dom/media/MediaStreamGraph.h
View File

@ -516,12 +516,6 @@ public:
* taken account of in UpdateCurrentTimeForStreams.
*/
GraphTime StreamTimeToGraphTime(StreamTime aTime);
/**
* Convert stream time to graph time. The result can be > mStateComputedTime,
* in which case we did the conversion optimistically assuming the stream
* will not be blocked after mStateComputedTime.
*/
GraphTime StreamTimeToGraphTimeWithBlocking(StreamTime aTime);
bool IsFinishedOnGraphThread() { return mFinished; }
void FinishOnGraphThread();