MediaCodecPlayer implementation (stage 4 - preroll)

media/base/android/media_codec_audio_decoder.h

Index: media/base/android/media_codec_audio_decoder.h
diff --git a/media/base/android/media_codec_audio_decoder.h b/media/base/android/media_codec_audio_decoder.h
index 53bb664f6018b833e4fa5f571c12051c8ad727c9..5bb4b99fe6b178e6d299123e94fe47820d182f40 100644
--- a/media/base/android/media_codec_audio_decoder.h
+++ b/media/base/android/media_codec_audio_decoder.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_
 
+#include <vector>
 #include "media/base/android/media_codec_decoder.h"
 
 namespace media {
@@ -21,6 +22,7 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder {
       const scoped_refptr<base::SingleThreadTaskRunner>& media_runner,
       const base::Closure& request_data_cb,
       const base::Closure& starvation_cb,
+      const base::Closure& preroll_done_cb,
       const base::Closure& stop_done_cb,
       const base::Closure& error_cb,
       const SetTimeCallback& update_current_time_cb);
@@ -31,6 +33,7 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder {
   bool HasStream() const override;
   void SetDemuxerConfigs(const DemuxerConfigs& configs) override;
   void Flush() override;
+  void ReleaseMediaCodec() override;
 
   // Sets the volume of the audio output.
   void SetVolume(double volume);
@@ -45,7 +48,7 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder {
   void OnOutputFormatChanged() override;
   void Render(int buffer_index,
               size_t size,
-              bool render_output,
+              RenderMode render_mode,
               base::TimeDelta pts,
               bool eos_encountered) override;
 
@@ -74,6 +77,11 @@ class MediaCodecAudioDecoder : public MediaCodecDecoder {
   // Frame count to sync with audio codec output.
   int64 frame_count_;
 
+#ifndef NDEBUG
+  // Maintains the number of postponed buffers to check there is zero or one.
+  bool num_postponed_buffers_;
+#endif
+
   // Base timestamp for the |audio_timestamp_helper_|.
   base::TimeDelta base_timestamp_;