зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1466606 - Revert "Add diagnostic code.". r=bryce
This reverts commit 4c1f90791492fc441cc600f66ff2d36c7910e905 MozReview-Commit-ID: KbMWKE08vT8 --HG-- extra : rebase_source : c3db78ddf82684475a63acd75de0180a9c66b6cb
This commit is contained in:
Родитель
1088aa797b
Коммит
b48f26ad93
|
@ -464,8 +464,7 @@ MediaSourceTrackDemuxer::DoSeek(const TimeUnit& aTime)
|
|||
mManager->GetSample(mType,
|
||||
TimeUnit::Zero(),
|
||||
result);
|
||||
mManager->AssertHasNextSampleIndex(mType);
|
||||
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(result) && sample);
|
||||
MOZ_ASSERT(NS_SUCCEEDED(result) && sample);
|
||||
mNextSample = Some(sample);
|
||||
mReset = false;
|
||||
{
|
||||
|
@ -506,7 +505,6 @@ MediaSourceTrackDemuxer::DoGetSamples(int32_t aNumSamples)
|
|||
if (mNextSample) {
|
||||
sample = mNextSample.ref();
|
||||
mNextSample.reset();
|
||||
mManager->AssertHasNextSampleIndex(mType);
|
||||
} else {
|
||||
MediaResult result = NS_OK;
|
||||
sample = mManager->GetSample(mType, MediaSourceDemuxer::EOS_FUZZ, result);
|
||||
|
@ -520,7 +518,6 @@ MediaSourceTrackDemuxer::DoGetSamples(int32_t aNumSamples)
|
|||
}
|
||||
return SamplesPromise::CreateAndReject(result, __func__);
|
||||
}
|
||||
mManager->AssertHasNextSampleIndex(mType);
|
||||
}
|
||||
RefPtr<SamplesHolder> samples = new SamplesHolder;
|
||||
samples->mSamples.AppendElement(sample);
|
||||
|
|
|
@ -2640,7 +2640,7 @@ TrackBuffersManager::GetNextRandomAccessPoint(TrackInfo::TrackType aTrack,
|
|||
{
|
||||
MOZ_ASSERT(OnTaskQueue());
|
||||
auto& trackData = GetTracksData(aTrack);
|
||||
MOZ_DIAGNOSTIC_ASSERT(trackData.mNextGetSampleIndex.isSome());
|
||||
MOZ_ASSERT(trackData.mNextGetSampleIndex.isSome());
|
||||
const TrackBuffersManager::TrackBuffer& track = GetTrackBuffer(aTrack);
|
||||
|
||||
uint32_t i = trackData.mNextGetSampleIndex.ref();
|
||||
|
|
|
@ -164,12 +164,6 @@ public:
|
|||
const media::TimeUnit& aFuzz);
|
||||
|
||||
void AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes) const;
|
||||
void AssertHasNextSampleIndex(TrackInfo::TrackType aTrack) const
|
||||
{
|
||||
const auto& trackData = GetTracksData(aTrack);
|
||||
MOZ_DIAGNOSTIC_ASSERT(trackData.mNextGetSampleIndex.isSome(),
|
||||
"next sample index must be set");
|
||||
}
|
||||
|
||||
private:
|
||||
typedef MozPromise<bool, MediaResult, /* IsExclusive = */ true> CodedFrameProcessingPromise;
|
||||
|
|
Загрузка…
Ссылка в новой задаче