Remove pending demuxer read state, prefer flag, it's not stable.

media/filters/decoder_stream.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FILTERS_DECODER_STREAM_H_
 #define MEDIA_FILTERS_DECODER_STREAM_H_
 
 #include <deque>
 #include <list>
 #include <memory>
@@ skipping 123 matching lines @@
   int get_fallback_buffers_size_for_testing() const {
     return fallback_buffers_.size();
   }
 
  private:
   enum State {
     STATE_UNINITIALIZED,
     STATE_INITIALIZING,
     STATE_NORMAL,  // Includes idle, pending decoder decode/reset.
     STATE_FLUSHING_DECODER,
-    STATE_PENDING_DEMUXER_READ,
     STATE_REINITIALIZING_DECODER,
     STATE_END_OF_STREAM,  // End of stream reached; returns EOS on all reads.
     STATE_ERROR,
   };
 
   void SelectDecoder(CdmContext* cdm_context);
 
   // Called when |decoder_selector| selected the |selected_decoder|.
   // |decrypting_demuxer_stream| was also populated if a DecryptingDemuxerStream
   // is created to help decrypt the encrypted stream.
@@ skipping 95 matching lines @@
 
   // Stores buffers that are guaranteed to be fed to the decoder before fetching
   // more from the demuxer stream. All buffers in this queue first were in
   // |pending_buffers_|.
   std::deque<scoped_refptr<DecoderBuffer>> fallback_buffers_;
 
   // TODO(tguilbert): support config changes during decoder fallback, see
   // crbug.com/603713
   bool received_config_change_during_reinit_;
 
-  // Used to track read requests in case the STATE_PENDIND_DEMUXER_READ get
-  // overwritten by an error.
+  // Used to track read requests; not rolled into |state_| since that is
+  // overwritten in many cases.
   bool pending_demuxer_read_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderStream<StreamType>> weak_factory_;
 
   // Used to invalidate pending decode requests and output callbacks when
   // falling back to a new decoder (on first decode error).
   base::WeakPtrFactory<DecoderStream<StreamType>> fallback_weak_factory_;
 };
 
 template <>
 bool DecoderStream<DemuxerStream::AUDIO>::CanReadWithoutStalling() const;
 
 template <>
 int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const;
 
 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_STREAM_H_