Fix ChunkDemuxer seek deadlock

media/filters/audio_renderer_base.h

 // Copyright (c) 2011 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.
 
 // AudioRendererBase takes care of the tricky queuing work and provides simple
 // methods for subclasses to peek and poke at audio data.  In addition to
 // AudioRenderer interface methods this classes doesn't implement, subclasses
 // must also implement the following methods:
 //   OnInitialized
 //   OnStop
@@ skipping 81 matching lines @@
 
  private:
   friend class AudioRendererBaseTest;
 
   // Helper method that schedules an asynchronous read from the decoder and
   // increments |pending_reads_|.
   //
   // Safe to call from any thread.
   void ScheduleRead_Locked();
 
+  // Returns true if the data in the buffer is all before
+  // |seek_timestamp_|. This can only return true while
+  // in the kSeeking state.
+  bool IsBeforeSeekTime(const scoped_refptr<Buffer>& buffer);
+
+  // Enqueues |buffer| in |algorithm_| if it is non-NULL and
+  // buffer->IsEndOfStream() returns false.
+  void EnqueueBuffer(const scoped_refptr<Buffer>& buffer);
+
   // Audio decoder.
   scoped_refptr<AudioDecoder> decoder_;
 
   // Algorithm for scaling audio.
   scoped_ptr<AudioRendererAlgorithmBase> algorithm_;
 
   base::Lock lock_;
 
   // Simple state tracking variable.
   enum State {
     kUninitialized,
     kPaused,
     kSeeking,
     kPlaying,
     kStopped,
-    kError,
     kUnderflow,
     kRebuffering,
   };
   State state_;
 
   // Keep track of our outstanding read to |decoder_|.
   bool pending_read_;
 
   // Keeps track of whether we received and rendered the end of stream buffer.
   bool recieved_end_of_stream_;
@@ skipping 12 matching lines @@
   base::TimeDelta seek_timestamp_;
 
   AudioDecoder::ReadCB read_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_BASE_H_