Attempt decoder fallback if first decode fails

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 104 matching lines @@
   typedef base::Closure ConfigChangeObserverCB;
   void set_config_change_observer(
       const ConfigChangeObserverCB& config_change_observer) {
     config_change_observer_cb_ = config_change_observer;
   }
 
   const Decoder* get_previous_decoder_for_testing() const {
     return previous_decoder_.get();
   }
 
+  int get_pending_buffers_size_for_testing() const {
+    return pending_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
@@ skipping 13 matching lines @@
                    const scoped_refptr<Output>& output);
 
   // Decodes |buffer| and returns the result via OnDecodeOutputReady().
   void Decode(const scoped_refptr<DecoderBuffer>& buffer);
 
   // Flushes the decoder with an EOS buffer to retrieve internally buffered
   // decoder output.
   void FlushDecoder();
 
   // Callback for Decoder::Decode().
-  void OnDecodeDone(int buffer_size, bool end_of_stream, DecodeStatus status);
+  void OnDecodeDone(int sequence_token,
+                    int buffer_size,
+                    bool end_of_stream,
+                    DecodeStatus status);
 
   // Output callback passed to Decoder::Initialize().
   void OnDecodeOutputReady(const scoped_refptr<Output>& output);
 
   // Reads a buffer from |stream_| and returns the result via OnBufferReady().
   void ReadFromDemuxerStream();
 
   // Callback for DemuxerStream::Read().
   void OnBufferReady(DemuxerStream::Status status,
                      const scoped_refptr<DecoderBuffer>& buffer);
@@ skipping 49 matching lines @@
   // Decoded buffers that haven't been read yet. Used when the decoder supports
   // parallel decoding.
   std::list<scoped_refptr<Output> > ready_outputs_;
 
   // Number of outstanding decode requests sent to the |decoder_|.
   int pending_decode_requests_;
 
   // Tracks the duration of incoming packets over time.
   MovingAverage duration_tracker_;
 
+  // Used to reattempt decoding when decode fails right after Initialize().
+  std::deque<scoped_refptr<DecoderBuffer>> pending_buffers_;
+  int sequence_token_;
+
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderStream<StreamType> > 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_