Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1282658. Part 16 - remove checks for |mReader->IsWaiting{Audio,Video}Data()|. r=kaku

Browse Source 
EnsureAudioDecodeTaskQueued() is called from several places where
mReader->IsWaitingAudioData() can be proven to be false:
1. OnAudioDecoded() - definitely false.
2. OnNotDecoded() - false because aReason is MediaDecoderReader::CANCELED.
3. OnSeekResolved() - false becuase we haven't requested any samples.
4. SetCallbacks() - false because AudioWaitCallback is resolved.

MozReview-Commit-ID: 8ppYIQQw0uK

--HG--
extra : rebase_source : 721ab44f6c23b87edfbe6d132fca9d85ca468368
This commit is contained in:
JW Wang 2016-06-29 17:26:13 +08:00
parent 7cf8943c64
commit 638885d3b8
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/media/AccurateSeekTask.cpp
View File

@ -109,13 +109,7 @@ AccurateSeekTask::EnsureAudioDecodeTaskQueued()
AssertOwnerThread();
MOZ_ASSERT(!mDoneAudioSeeking);
MOZ_ASSERT(!mReader->IsRequestingAudioData());
SAMPLE_LOG("EnsureAudioDecodeTaskQueued status=%s", AudioRequestStatus());
if (mReader->IsWaitingAudioData()) {
return;
}
MOZ_ASSERT(!mReader->IsWaitingAudioData());
mReader->RequestAudioData();
}
@ -125,13 +119,7 @@ AccurateSeekTask::EnsureVideoDecodeTaskQueued()
AssertOwnerThread();
MOZ_ASSERT(!mDoneVideoSeeking);
MOZ_ASSERT(!mReader->IsRequestingVideoData());
SAMPLE_LOG("EnsureVideoDecodeTaskQueued status=%s", VideoRequestStatus());
if (mReader->IsWaitingVideoData()) {
return;
}
MOZ_ASSERT(!mReader->IsWaitingVideoData());
mReader->RequestVideoData(false, media::TimeUnit());
}