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

Bug 1069289 - take |mAudioEndTime| into account when updating playback position at the end of playback. r=kinetik

Browse Source
This commit is contained in:
JW Wang 2014-10-07 19:45:00 +02:00
parent 049052f05d
commit 83dc138454
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/media/MediaDecoderStateMachine.cpp
View File

@ -2478,8 +2478,8 @@ nsresult MediaDecoderStateMachine::RunStateMachine()
// will take care of calling MediaDecoder::PlaybackEnded.
if (mDecoder->GetState() == MediaDecoder::PLAY_STATE_PLAYING &&
!mDecoder->GetDecodedStream()) {
int64_t videoTime = HasVideo() ? mVideoFrameEndTime : 0;
int64_t clockTime = std::max(mEndTime, videoTime);
int64_t clockTime = std::max(mAudioEndTime, mVideoFrameEndTime);
clockTime = std::max(int64_t(0), std::max(clockTime, mEndTime));
UpdatePlaybackPosition(clockTime);
{