corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset ac5e69c40ff1 (bug 1089480) for m-2 bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2014-10-28 08:21:10 +01:00
parent 9bf24574e4
commit f2d3db6f2d
4 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dom/media/MediaDecoderStateMachine.cpp
View File

@@ -2016,7 +2016,18 @@ MediaDecoderStateMachine::FinishDecodeMetadata()
}
if (!mScheduler->IsRealTime() && !mDecodingFrozenAtStateMetadata) {
SetStartTime(mReader->ComputeStartTime());
const VideoData* v = VideoQueue().PeekFront();
const AudioData* a = AudioQueue().PeekFront();
int64_t startTime = std::min<int64_t>(a ? a->mTime : INT64_MAX,
v ? v->mTime : INT64_MAX);
if (startTime == INT64_MAX) {
startTime = 0;
}
DECODER_LOG("DecodeMetadata first video frame start %lld", v ? v->mTime : -1);
DECODER_LOG("DecodeMetadata first audio frame start %lld", a ? a->mTime : -1);
SetStartTime(startTime);
if (VideoQueue().GetSize()) {
ReentrantMonitorAutoExit exitMon(mDecoder->GetReentrantMonitor());
RenderVideoFrame(VideoQueue().PeekFront(), TimeStamp::Now());