Bug 1283370. Part 3 - remove unused HasVideo(). r=kaku
MozReview-Commit-ID: 8Cj1ILiWkNv
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -46,21 +46,20 @@ NextFrameSeekTask::NextFrameSeekTask(con
int64_t aCurrentMediaTime,
MediaQueue<MediaData>& aAudioQueue,
MediaQueue<MediaData>& aVideoQueue)
: SeekTask(aDecoderID, aThread, aReader, Move(aSeekJob))
, mAudioQueue(aAudioQueue)
, mVideoQueue(aVideoQueue)
, mCurrentTimeBeforeSeek(aCurrentMediaTime)
, mHasAudio(aInfo.HasAudio())
- , mHasVideo(aInfo.HasVideo())
, mDuration(aDuration)
{
AssertOwnerThread();
- MOZ_ASSERT(HasVideo());
+ MOZ_ASSERT(aInfo.HasVideo());
// Configure MediaDecoderReaderWrapper.
SetCallbacks();
}
NextFrameSeekTask::~NextFrameSeekTask()
{
AssertOwnerThread();
@@ -69,23 +68,16 @@ NextFrameSeekTask::~NextFrameSeekTask()
bool
NextFrameSeekTask::HasAudio() const
{
AssertOwnerThread();
return mHasAudio;
}
-bool
-NextFrameSeekTask::HasVideo() const
-{
- AssertOwnerThread();
- return mHasVideo;
-}
-
void
NextFrameSeekTask::Discard()
{
AssertOwnerThread();
// Disconnect MediaDecoder.
mSeekJob.RejectIfExists(__func__);
--- a/dom/media/NextFrameSeekTask.h
+++ b/dom/media/NextFrameSeekTask.h
@@ -40,18 +40,16 @@ public:
bool NeedToResetMDSM() const override;
private:
~NextFrameSeekTask();
bool HasAudio() const;
- bool HasVideo() const;
-
bool IsVideoDecoding() const;
nsresult EnsureVideoDecodeTaskQueued();
const char* VideoRequestStatus();
void RequestVideoData();
@@ -83,17 +81,16 @@ private:
MediaQueue<MediaData>& mAudioQueue;
MediaQueue<MediaData>& mVideoQueue;
/*
* Internal state.
*/
const int64_t mCurrentTimeBeforeSeek;
const bool mHasAudio;
- const bool mHasVideo;
media::TimeUnit mDuration;
MediaEventListener mAudioCallback;
MediaEventListener mVideoCallback;
MediaEventListener mAudioWaitCallback;
MediaEventListener mVideoWaitCallback;
};