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

Bug 1126465 - Don't leave stale value in mPendingSeek when there's no audio track. r=mattwoodrow

Browse Source
This commit is contained in:
Bobby Holley 2015-01-28 18:54:10 -08:00
parent 874d5516e4
commit 7f358c3233
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/media/mediasource/MediaSourceReader.cpp
View File

@ -706,12 +706,12 @@ MediaSourceReader::CancelSeek()
void
MediaSourceReader::OnVideoSeekCompleted(int64_t aTime)
{
mPendingSeekTime = aTime;
MOZ_ASSERT(mVideoIsSeeking);
MOZ_ASSERT(!mAudioIsSeeking);
mVideoIsSeeking = false;
if (mAudioTrack) {
mPendingSeekTime = aTime;
mAudioIsSeeking = true;
SwitchAudioReader(mPendingSeekTime);
mAudioReader->Seek(mPendingSeekTime, 0)
@ -721,7 +721,8 @@ MediaSourceReader::OnVideoSeekCompleted(int64_t aTime)
MSE_DEBUG("MediaSourceReader(%p)::Seek audio reader=%p", this, mAudioReader.get());
return;
}
mSeekPromise.Resolve(mPendingSeekTime, __func__);
mPendingSeekTime = -1;
mSeekPromise.Resolve(aTime, __func__);
}
void
@ -732,8 +733,8 @@ MediaSourceReader::OnAudioSeekCompleted(int64_t aTime)
MOZ_ASSERT(!mVideoIsSeeking);
mAudioIsSeeking = false;
mSeekPromise.Resolve(mPendingSeekTime, __func__);
mPendingSeekTime = -1;
mSeekPromise.Resolve(aTime, __func__);
}
void