Bug 1283370. Part 2 - remove unnecessary checks for HasVideo() for we assert it in the constructor. r=kaku
MozReview-Commit-ID: 5wfWmgtdgQw
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -189,17 +189,17 @@ NextFrameSeekTask::Seek(const media::Tim
SeekTaskResolveValue val = {}; // Zero-initialize data members.
return SeekTask::SeekTaskPromise::CreateAndResolve(val, __func__);
}
bool
NextFrameSeekTask::IsVideoDecoding() const
{
AssertOwnerThread();
- return HasVideo() && !mIsVideoQueueFinished;
+ return !mIsVideoQueueFinished;
}
nsresult
NextFrameSeekTask::EnsureVideoDecodeTaskQueued()
{
AssertOwnerThread();
SAMPLE_LOG("EnsureVideoDecodeTaskQueued isDecoding=%d status=%s",
IsVideoDecoding(), VideoRequestStatus());
@@ -254,28 +254,28 @@ NextFrameSeekTask::IsAudioSeekComplete()
bool
NextFrameSeekTask::IsVideoSeekComplete()
{
AssertOwnerThread();
SAMPLE_LOG("IsVideoSeekComplete() curTarVal=%d vqFin=%d vqSz=%d",
mSeekJob.Exists(), mIsVideoQueueFinished, !!mSeekedVideoData);
- return !HasVideo() || mIsVideoQueueFinished || mSeekedVideoData;
+ return mIsVideoQueueFinished || mSeekedVideoData;
}
void
NextFrameSeekTask::CheckIfSeekComplete()
{
AssertOwnerThread();
const bool audioSeekComplete = IsAudioSeekComplete();
const bool videoSeekComplete = IsVideoSeekComplete();
- if (HasVideo() && !videoSeekComplete) {
+ if (!videoSeekComplete) {
// We haven't reached the target. Ensure we have requested another sample.
if (NS_FAILED(EnsureVideoDecodeTaskQueued())) {
DECODER_WARN("Failed to request video during seek");
RejectIfExist(__func__);
}
}
SAMPLE_LOG("CheckIfSeekComplete() audioSeekComplete=%d videoSeekComplete=%d",