зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1286454 part 3 - remove MediaDecoderReader::mVideoDiscontinuity since it leads to nothing now; r=jwwang
MozReview-Commit-ID: 1JMngmA61Bd --HG-- extra : rebase_source : 10e74faa50c897f130006014956d85f4c3886020
This commit is contained in:
Родитель
4000b4f2ab
Коммит
a863ce05a0
|
@ -224,7 +224,6 @@ MediaDecoderReader::MediaDecoderReader(AbstractMediaDecoder* aDecoder)
|
|||
, mIgnoreAudioOutputFormat(false)
|
||||
, mHitAudioDecodeError(false)
|
||||
, mShutdown(false)
|
||||
, mVideoDiscontinuity(false)
|
||||
, mIsSuspended(mTaskQueue, true,
|
||||
"MediaDecoderReader::mIsSuspended (Canonical)")
|
||||
{
|
||||
|
@ -290,7 +289,6 @@ nsresult MediaDecoderReader::ResetDecode(TrackSet aTracks)
|
|||
{
|
||||
if (aTracks.contains(TrackInfo::kVideoTrack)) {
|
||||
VideoQueue().Reset();
|
||||
mVideoDiscontinuity = true;
|
||||
mBaseVideoPromise.RejectIfExists(CANCELED, __func__);
|
||||
}
|
||||
|
||||
|
@ -456,9 +454,6 @@ MediaDecoderReader::RequestVideoData(bool aSkipToNextKeyframe,
|
|||
}
|
||||
if (VideoQueue().GetSize() > 0) {
|
||||
RefPtr<VideoData> v = VideoQueue().PopFront();
|
||||
if (v && mVideoDiscontinuity) {
|
||||
mVideoDiscontinuity = false;
|
||||
}
|
||||
mBaseVideoPromise.Resolve(v, __func__);
|
||||
} else if (VideoQueue().IsFinished()) {
|
||||
mBaseVideoPromise.Reject(END_OF_STREAM, __func__);
|
||||
|
|
|
@ -464,9 +464,6 @@ private:
|
|||
MozPromiseHolder<MediaDataPromise> mBaseAudioPromise;
|
||||
MozPromiseHolder<MediaDataPromise> mBaseVideoPromise;
|
||||
|
||||
// Flags whether a the next audio/video sample comes after a "gap" or
|
||||
// "discontinuity" in the stream. For example after a seek.
|
||||
bool mVideoDiscontinuity;
|
||||
Canonical<bool> mIsSuspended;
|
||||
|
||||
MediaEventListener mDataArrivedListener;
|
||||
|
|
Загрузка…
Ссылка в новой задаче