Disable preroll duration increase on underflow for MediaSource playback.

media/filters/audio_renderer_impl.h

 // Copyright (c) 2012 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.
 
 // Audio rendering unit utilizing an AudioRendererSink to output data.
 //
 // This class lives inside three threads during it's lifetime, namely:
 // 1. Render thread
 //    Where the object is created.
 // 2. Media thread (provided via constructor)
@@ skipping 34 matching lines @@
       NON_EXPORTED_BASE(public AudioRendererSink::RenderCallback) {
  public:
   // |message_loop| is the thread on which AudioRendererImpl will execute.
   //
   // |sink| is used as the destination for the rendered audio.
   //
   // |decoders| contains the AudioDecoders to use when initializing.
   //
   // |set_decryptor_ready_cb| is fired when the audio decryptor is available
   // (only applicable if the stream is encrypted and we have a decryptor).
+  //
+  // |increase_preroll_on_underflow| Set to true if the preroll duration
+  // should be increased when ResumeAfterUnderflow() is called.
   AudioRendererImpl(const scoped_refptr<base::MessageLoopProxy>& message_loop,
                     AudioRendererSink* sink,
                     ScopedVector<AudioDecoder> decoders,
-                    const SetDecryptorReadyCB& set_decryptor_ready_cb);
+                    const SetDecryptorReadyCB& set_decryptor_ready_cb,
+                    bool increase_preroll_on_underflow);
   virtual ~AudioRendererImpl();
 
   // AudioRenderer implementation.
   virtual void Initialize(DemuxerStream* stream,
                           const PipelineStatusCB& init_cb,
                           const StatisticsCB& statistics_cb,
                           const base::Closure& underflow_cb,
                           const TimeCB& time_cb,
                           const base::Closure& ended_cb,
                           const base::Closure& disabled_cb,
                           const PipelineStatusCB& error_cb) OVERRIDE;
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void SetPlaybackRate(float rate) OVERRIDE;
   virtual void Preroll(base::TimeDelta time,
                        const PipelineStatusCB& cb) OVERRIDE;
-  virtual void ResumeAfterUnderflow(bool buffer_more_audio) OVERRIDE;
+  virtual void ResumeAfterUnderflow() OVERRIDE;
   virtual void SetVolume(float volume) OVERRIDE;
 
   // Disables underflow support.  When used, |state_| will never transition to
   // kUnderflow resulting in Render calls that underflow returning 0 frames
   // instead of some number of silence frames.  Must be called prior to
   // Initialize().
   void DisableUnderflowForTesting();
 
   // Allows injection of a custom time callback for non-realtime testing.
   typedef base::Callback<base::Time()> NowCB;
@@ skipping 161 matching lines @@
   // Instead of trying to invent OS-specific solution for each and every OS we
   // are supporting, use simple workaround: every time we fill the buffer we
   // remember when it should stop playing, and do not assume that buffer is
   // empty till that time. Workaround is not bulletproof, as we don't exactly
   // know when that particular data would start playing, but it is much better
   // than nothing.
   base::Time earliest_end_time_;
   size_t total_frames_filled_;
 
   bool underflow_disabled_;
+  bool increase_preroll_on_underflow_;
 
   // True if the renderer receives a buffer with kAborted status during preroll,
   // false otherwise. This flag is cleared on the next Preroll() call.
   bool preroll_aborted_;
 
   // End variables which must be accessed under |lock_|. ----------------------
 
   // Variables used only on the audio thread. ---------------------------------
   int actual_frames_per_buffer_;
   scoped_ptr<uint8[]> audio_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_AUDIO_RENDERER_IMPL_H_