mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 23:05:42 +00:00
Bug 1252766 - Remove MediaDecoderStateMachine::mDecodeToSeekTarget which is never read. r=kaku.
MozReview-Commit-ID: KAArYtFqUKQ
This commit is contained in:
parent
00b7a72ce2
commit
be803477f3
@ -231,7 +231,6 @@ MediaDecoderStateMachine::MediaDecoderStateMachine(MediaDecoder* aDecoder,
|
|||||||
mDecodeThreadWaiting(false),
|
mDecodeThreadWaiting(false),
|
||||||
mDropAudioUntilNextDiscontinuity(false),
|
mDropAudioUntilNextDiscontinuity(false),
|
||||||
mDropVideoUntilNextDiscontinuity(false),
|
mDropVideoUntilNextDiscontinuity(false),
|
||||||
mDecodeToSeekTarget(false),
|
|
||||||
mCurrentTimeBeforeSeek(0),
|
mCurrentTimeBeforeSeek(0),
|
||||||
mCorruptFrames(60),
|
mCorruptFrames(60),
|
||||||
mDecodingFirstFrame(true),
|
mDecodingFirstFrame(true),
|
||||||
@ -1024,7 +1023,6 @@ MediaDecoderStateMachine::CheckIfSeekComplete()
|
|||||||
if (audioSeekComplete && videoSeekComplete) {
|
if (audioSeekComplete && videoSeekComplete) {
|
||||||
NS_ASSERTION(AudioQueue().GetSize() <= 1, "Should decode at most one sample");
|
NS_ASSERTION(AudioQueue().GetSize() <= 1, "Should decode at most one sample");
|
||||||
NS_ASSERTION(VideoQueue().GetSize() <= 1, "Should decode at most one sample");
|
NS_ASSERTION(VideoQueue().GetSize() <= 1, "Should decode at most one sample");
|
||||||
mDecodeToSeekTarget = false;
|
|
||||||
SeekCompleted();
|
SeekCompleted();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1646,7 +1644,6 @@ MediaDecoderStateMachine::InitiateSeek()
|
|||||||
self->mSeekRequest.Complete();
|
self->mSeekRequest.Complete();
|
||||||
// We must decode the first samples of active streams, so we can determine
|
// We must decode the first samples of active streams, so we can determine
|
||||||
// the new stream time. So dispatch tasks to do that.
|
// the new stream time. So dispatch tasks to do that.
|
||||||
self->mDecodeToSeekTarget = true;
|
|
||||||
self->EnsureAudioDecodeTaskQueued();
|
self->EnsureAudioDecodeTaskQueued();
|
||||||
self->EnsureVideoDecodeTaskQueued();
|
self->EnsureVideoDecodeTaskQueued();
|
||||||
}, [self] (nsresult aResult) -> void {
|
}, [self] (nsresult aResult) -> void {
|
||||||
@ -2405,7 +2402,6 @@ MediaDecoderStateMachine::Reset()
|
|||||||
mFirstVideoFrameAfterSeek = nullptr;
|
mFirstVideoFrameAfterSeek = nullptr;
|
||||||
mDropAudioUntilNextDiscontinuity = true;
|
mDropAudioUntilNextDiscontinuity = true;
|
||||||
mDropVideoUntilNextDiscontinuity = true;
|
mDropVideoUntilNextDiscontinuity = true;
|
||||||
mDecodeToSeekTarget = false;
|
|
||||||
|
|
||||||
mMetadataRequest.DisconnectIfExists();
|
mMetadataRequest.DisconnectIfExists();
|
||||||
mAudioDataRequest.DisconnectIfExists();
|
mAudioDataRequest.DisconnectIfExists();
|
||||||
|
@ -1121,10 +1121,6 @@ private:
|
|||||||
bool mDropAudioUntilNextDiscontinuity;
|
bool mDropAudioUntilNextDiscontinuity;
|
||||||
bool mDropVideoUntilNextDiscontinuity;
|
bool mDropVideoUntilNextDiscontinuity;
|
||||||
|
|
||||||
// True if we need to decode forwards to the seek target inside
|
|
||||||
// mCurrentSeekTarget.
|
|
||||||
bool mDecodeToSeekTarget;
|
|
||||||
|
|
||||||
// Track the current seek promise made by the reader.
|
// Track the current seek promise made by the reader.
|
||||||
MozPromiseRequestHolder<MediaDecoderReader::SeekPromise> mSeekRequest;
|
MozPromiseRequestHolder<MediaDecoderReader::SeekPromise> mSeekRequest;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user