Bug 1341200. Part 9 - remove unused mShuttingDown. r=jya

MozReview-Commit-ID: 8OWgOB07rEP

--HG--
extra : rebase_source : edc89b4ba3809409ddf3aa71d1c027f6bdbdb6c7
extra : intermediate-source : 71377f45a8ae845332f31761553dad1f3d2d7f85
extra : source : 5d1b66fb3a4b02aa4bd0405e03d199bbafaafb1e
This commit is contained in:
JW Wang 2017-02-27 00:17:16 +08:00
Родитель e8e4792c53
Коммит 8420ad6d55
2 изменённых файлов: 3 добавлений и 4 удалений

Просмотреть файл

@ -1936,7 +1936,7 @@ MediaFormatReader::HandleDemuxedSamples(
auto& decoder = GetDecoderData(aTrack); auto& decoder = GetDecoderData(aTrack);
if (decoder.mFlushing || decoder.mShuttingDown) { if (decoder.mFlushing) {
LOGV("Decoder operation in progress, let it complete."); LOGV("Decoder operation in progress, let it complete.");
return; return;
} }
@ -2310,7 +2310,7 @@ MediaFormatReader::Update(TrackType aTrack)
LOGV( LOGV(
"Update(%s) ni=%d no=%d in:%" PRIu64 " out:%" PRIu64 "Update(%s) ni=%d no=%d in:%" PRIu64 " out:%" PRIu64
" qs=%u decoding:%d flushing:%d shutdown:%d pending:%u waiting:%d sid:%u", " qs=%u decoding:%d flushing:%d desc:%s pending:%u waiting:%d sid:%u",
TrackTypeToStr(aTrack), TrackTypeToStr(aTrack),
needInput, needInput,
needOutput, needOutput,
@ -2319,7 +2319,7 @@ MediaFormatReader::Update(TrackType aTrack)
uint32_t(size_t(decoder.mSizeOfQueue)), uint32_t(size_t(decoder.mSizeOfQueue)),
decoder.mDecodeRequest.Exists(), decoder.mDecodeRequest.Exists(),
decoder.mFlushing, decoder.mFlushing,
decoder.mShuttingDown, decoder.mDescription,
uint32_t(decoder.mOutput.Length()), uint32_t(decoder.mOutput.Length()),
decoder.mWaitingForData, decoder.mWaitingForData,
decoder.mLastStreamSourceID); decoder.mLastStreamSourceID);

Просмотреть файл

@ -249,7 +249,6 @@ private:
// Set to true if the last operation run on the decoder was a flush. // Set to true if the last operation run on the decoder was a flush.
bool mFlushed; bool mFlushed;
MozPromiseHolder<ShutdownPromise> mShutdownPromise; MozPromiseHolder<ShutdownPromise> mShutdownPromise;
bool mShuttingDown = false; // True if shutdown is in action.
MozPromiseRequestHolder<MediaDataDecoder::DecodePromise> mDrainRequest; MozPromiseRequestHolder<MediaDataDecoder::DecodePromise> mDrainRequest;
DrainState mDrainState; DrainState mDrainState;