Bug 1285122. Part 1 - remove SeekTask::mNeedToStopPrerolling{Audio,Video} per discussion in https://reviewboard.mozilla.org/r/43689/#comment54421. r=kaku
MozReview-Commit-ID: 1r909HO5Cbl
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1693,24 +1693,16 @@ MediaDecoderStateMachine::OnSeekTaskReso
StopPrerollingAudio();
}
if (aValue.mIsVideoQueueFinished) {
VideoQueue().Finish();
StopPrerollingVideo();
}
- if (aValue.mNeedToStopPrerollingAudio) {
- StopPrerollingAudio();
- }
-
- if (aValue.mNeedToStopPrerollingVideo) {
- StopPrerollingVideo();
- }
-
SeekCompleted();
}
void
MediaDecoderStateMachine::OnSeekTaskRejected(SeekTaskRejectValue aValue)
{
MOZ_ASSERT(OnTaskQueue());
MOZ_ASSERT(mState == DECODER_STATE_SEEKING);
@@ -1722,24 +1714,16 @@ MediaDecoderStateMachine::OnSeekTaskReje
StopPrerollingAudio();
}
if (aValue.mIsVideoQueueFinished) {
VideoQueue().Finish();
StopPrerollingVideo();
}
- if (aValue.mNeedToStopPrerollingAudio) {
- StopPrerollingAudio();
- }
-
- if (aValue.mNeedToStopPrerollingVideo) {
- StopPrerollingVideo();
- }
-
DecodeError();
DiscardSeekTaskIfExist();
}
void
MediaDecoderStateMachine::DiscardSeekTaskIfExist()
{
--- a/dom/media/SeekTask.cpp
+++ b/dom/media/SeekTask.cpp
@@ -16,18 +16,16 @@ SeekTask::SeekTask(const void* aDecoderI
const SeekTarget& aTarget)
: mDecoderID(aDecoderID)
, mOwnerThread(aThread)
, mReader(aReader)
, mTarget(aTarget)
, mIsDiscarded(false)
, mIsAudioQueueFinished(false)
, mIsVideoQueueFinished(false)
- , mNeedToStopPrerollingAudio(false)
- , mNeedToStopPrerollingVideo(false)
{
AssertOwnerThread();
}
SeekTask::~SeekTask()
{
AssertOwnerThread();
MOZ_ASSERT(mIsDiscarded);
@@ -38,32 +36,28 @@ SeekTask::Resolve(const char* aCallSite)
{
AssertOwnerThread();
SeekTaskResolveValue val;
val.mSeekedAudioData = mSeekedAudioData;
val.mSeekedVideoData = mSeekedVideoData;
val.mIsAudioQueueFinished = mIsAudioQueueFinished;
val.mIsVideoQueueFinished = mIsVideoQueueFinished;
- val.mNeedToStopPrerollingAudio = mNeedToStopPrerollingAudio;
- val.mNeedToStopPrerollingVideo = mNeedToStopPrerollingVideo;
mSeekTaskPromise.Resolve(val, aCallSite);
}
void
SeekTask::RejectIfExist(const char* aCallSite)
{
AssertOwnerThread();
SeekTaskRejectValue val;
val.mIsAudioQueueFinished = mIsAudioQueueFinished;
val.mIsVideoQueueFinished = mIsVideoQueueFinished;
- val.mNeedToStopPrerollingAudio = mNeedToStopPrerollingAudio;
- val.mNeedToStopPrerollingVideo = mNeedToStopPrerollingVideo;
mSeekTaskPromise.RejectIfExists(val, aCallSite);
}
void
SeekTask::AssertOwnerThread() const
{
MOZ_ASSERT(mOwnerThread->IsCurrentThreadIn());
--- a/dom/media/SeekTask.h
+++ b/dom/media/SeekTask.h
@@ -23,26 +23,22 @@ class TimeUnit;
}
struct SeekTaskResolveValue
{
RefPtr<MediaData> mSeekedAudioData;
RefPtr<MediaData> mSeekedVideoData;
bool mIsAudioQueueFinished;
bool mIsVideoQueueFinished;
- bool mNeedToStopPrerollingAudio;
- bool mNeedToStopPrerollingVideo;
};
struct SeekTaskRejectValue
{
bool mIsAudioQueueFinished;
bool mIsVideoQueueFinished;
- bool mNeedToStopPrerollingAudio;
- bool mNeedToStopPrerollingVideo;
};
class SeekTask {
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(SeekTask)
public:
static const bool IsExclusive = true;
@@ -90,15 +86,13 @@ protected:
/*
* Information which are going to be returned to MDSM.
*/
RefPtr<MediaData> mSeekedAudioData;
RefPtr<MediaData> mSeekedVideoData;
bool mIsAudioQueueFinished;
bool mIsVideoQueueFinished;
- bool mNeedToStopPrerollingAudio;
- bool mNeedToStopPrerollingVideo;
};
} // namespace mozilla
#endif /* SEEK_TASK_H */