Ignore calls to Reset() when in error state

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 <list>
 
 #include "base/callback.h"
@@ skipping 65 matching lines @@
   // |read_cb| is always called asynchronously. This method should only be
   // called after initialization has succeeded and must not be called during
   // pending Reset().
   void Read(const ReadCB& read_cb);
 
   // Resets the decoder, flushes all decoded outputs and/or internal buffers,
   // fires any existing pending read callback and calls |closure| on completion.
   // Note that |closure| is always called asynchronously. This method should
   // only be called after initialization has succeeded and must not be called
   // during pending Reset().
+  // N.B: If the decoder stream has run into an error, calling this method does
+  // not 'reset' it to a normal state.
   void Reset(const base::Closure& closure);
 
   // Returns true if the decoder currently has the ability to decode and return
   // an Output.
   // TODO(rileya): Remove the need for this by refactoring Decoder queueing
   // behavior.
   bool CanReadWithoutStalling() const;
 
   // Returns maximum concurrent decode requests for the current |decoder_|.
   int GetMaxDecodeRequests() const;
@@ skipping 37 matching lines @@
  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,
-    // TODO(tguilbert): support config changes during decoder fallback, see
-    // crbug.com/603713
-    STATE_CONFIG_CHANGE_RECEIVED_WHILE_REINITIALIZING_DECODER
   };
 
   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.
   void OnDecoderSelected(
       std::unique_ptr<Decoder> selected_decoder,
       std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream);
@@ skipping 86 matching lines @@
 
   // Stores buffers that might be reused if the decoder fails right after
   // Initialize().
   std::deque<scoped_refptr<DecoderBuffer>> pending_buffers_;
 
   // 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.
+  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_