Bug 1283370. Part 4 - remove HasAudio(). r=kaku
We guarantee to have |!mReader->IsRequestingAudioData() && !mReader->IsWaitingAudioData()|
when there is no audio at all. We can remove the check for HasAudio().
MozReview-Commit-ID: KYYIq6n06Vr
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -45,39 +45,31 @@ NextFrameSeekTask::NextFrameSeekTask(con
const media::TimeUnit& aDuration,
int64_t aCurrentMediaTime,
MediaQueue<MediaData>& aAudioQueue,
MediaQueue<MediaData>& aVideoQueue)
: SeekTask(aDecoderID, aThread, aReader, Move(aSeekJob))
, mAudioQueue(aAudioQueue)
, mVideoQueue(aVideoQueue)
, mCurrentTimeBeforeSeek(aCurrentMediaTime)
- , mHasAudio(aInfo.HasAudio())
, mDuration(aDuration)
{
AssertOwnerThread();
MOZ_ASSERT(aInfo.HasVideo());
// Configure MediaDecoderReaderWrapper.
SetCallbacks();
}
NextFrameSeekTask::~NextFrameSeekTask()
{
AssertOwnerThread();
MOZ_ASSERT(mIsDiscarded);
}
-bool
-NextFrameSeekTask::HasAudio() const
-{
- AssertOwnerThread();
- return mHasAudio;
-}
-
void
NextFrameSeekTask::Discard()
{
AssertOwnerThread();
// Disconnect MediaDecoder.
mSeekJob.RejectIfExists(__func__);
@@ -235,18 +227,17 @@ NextFrameSeekTask::IsAudioSeekComplete()
{
AssertOwnerThread();
SAMPLE_LOG("IsAudioSeekComplete() curTarVal=%d aqFin=%d aqSz=%d req=%d wait=%d",
mSeekJob.Exists(), mIsAudioQueueFinished, !!mSeekedAudioData,
mReader->IsRequestingAudioData(), mReader->IsWaitingAudioData());
// Just make sure that we are not requesting or waiting for audio data. We
// don't really need to get an decoded audio data or get EOS here.
- return !HasAudio() ||
- (!mReader->IsRequestingAudioData() && !mReader->IsWaitingAudioData());
+ return !mReader->IsRequestingAudioData() && !mReader->IsWaitingAudioData();
}
bool
NextFrameSeekTask::IsVideoSeekComplete()
{
AssertOwnerThread();
SAMPLE_LOG("IsVideoSeekComplete() curTarVal=%d vqFin=%d vqSz=%d",
mSeekJob.Exists(), mIsVideoQueueFinished, !!mSeekedVideoData);
--- a/dom/media/NextFrameSeekTask.h
+++ b/dom/media/NextFrameSeekTask.h
@@ -38,18 +38,16 @@ public:
RefPtr<SeekTaskPromise> Seek(const media::TimeUnit& aDuration) override;
bool NeedToResetMDSM() const override;
private:
~NextFrameSeekTask();
- bool HasAudio() const;
-
bool IsVideoDecoding() const;
nsresult EnsureVideoDecodeTaskQueued();
const char* VideoRequestStatus();
void RequestVideoData();
@@ -80,17 +78,16 @@ private:
*/
MediaQueue<MediaData>& mAudioQueue;
MediaQueue<MediaData>& mVideoQueue;
/*
* Internal state.
*/
const int64_t mCurrentTimeBeforeSeek;
- const bool mHasAudio;
media::TimeUnit mDuration;
MediaEventListener mAudioCallback;
MediaEventListener mVideoCallback;
MediaEventListener mAudioWaitCallback;
MediaEventListener mVideoWaitCallback;
};