зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1286454 part 4 - remove DecoderData::mDiscontinuity since it leads to nothing now; r=jwwang
MozReview-Commit-ID: I6Qzq1p6GyT --HG-- extra : rebase_source : 796fa9611c31068cec69b631b26e542ae1cf4295
This commit is contained in:
Родитель
a863ce05a0
Коммит
8f72f1ce87
|
@ -1320,14 +1320,8 @@ MediaFormatReader::Update(TrackType aTrack)
|
|||
void
|
||||
MediaFormatReader::ReturnOutput(MediaData* aData, TrackType aTrack)
|
||||
{
|
||||
auto& decoder = GetDecoderData(aTrack);
|
||||
MOZ_ASSERT(decoder.HasPromise());
|
||||
MOZ_ASSERT(GetDecoderData(aTrack).HasPromise());
|
||||
MOZ_DIAGNOSTIC_ASSERT(aData->mType != MediaData::NULL_DATA);
|
||||
if (decoder.mDiscontinuity) {
|
||||
LOGV("Setting discontinuity flag");
|
||||
decoder.mDiscontinuity = false;
|
||||
}
|
||||
|
||||
LOG("Resolved data promise for %s [%lld, %lld]", TrackTypeToStr(aTrack),
|
||||
aData->mTime, aData->GetEndTime());
|
||||
|
||||
|
|
|
@ -242,7 +242,6 @@ private:
|
|||
, mDemuxEOS(false)
|
||||
, mWaitingForData(false)
|
||||
, mReceivedNewData(false)
|
||||
, mDiscontinuity(true)
|
||||
, mDecoderInitialized(false)
|
||||
, mDecodingRequested(false)
|
||||
, mOutputRequested(false)
|
||||
|
@ -294,7 +293,6 @@ private:
|
|||
bool mDemuxEOS;
|
||||
bool mWaitingForData;
|
||||
bool mReceivedNewData;
|
||||
bool mDiscontinuity;
|
||||
|
||||
// Pending seek.
|
||||
MozPromiseRequestHolder<MediaTrackDemuxer::SeekPromise> mSeekRequest;
|
||||
|
@ -398,7 +396,6 @@ private:
|
|||
MOZ_ASSERT(mOwner->OnTaskQueue());
|
||||
mDemuxEOS = false;
|
||||
mWaitingForData = false;
|
||||
mDiscontinuity = true;
|
||||
mQueuedSamples.Clear();
|
||||
mDecodingRequested = false;
|
||||
mOutputRequested = false;
|
||||
|
|
Загрузка…
Ссылка в новой задаче