MediaCodecPlayer implementation (stage 4 - preroll)

media/base/android/media_codec_audio_decoder.h

 // Copyright 2015 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_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_AUDIO_DECODER_H_
 
+#include <vector>

[wolenetz, 2015/08/20 20:37:36]

nit: insert blank line between <> and "" includes.

[Tima Vaisburd, 2015/08/20 22:36:36]

Just removed this include, it is not needed.

 #include "media/base/android/media_codec_decoder.h"
 
 namespace media {
 
 class AudioTimestampHelper;
 
 // Audio decoder for MediaCodecPlayer
 class MediaCodecAudioDecoder : public MediaCodecDecoder {
  public:
   // For parameters see media_codec_decoder.h
   // update_current_time_cb: callback that reports current playback time.
   //                         Called for each rendered frame.
   MediaCodecAudioDecoder(
       const scoped_refptr<base::SingleThreadTaskRunner>& media_runner,
       const base::Closure& request_data_cb,
       const base::Closure& starvation_cb,
       const base::Closure& stop_done_cb,
       const base::Closure& error_cb,
       const SetTimeCallback& update_current_time_cb);
   ~MediaCodecAudioDecoder() override;
 
   const char* class_name() const override;
 
   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);
 
   // Sets the base timestamp for |audio_timestamp_helper_|.
   void SetBaseTimestamp(base::TimeDelta base_timestamp);
 
  protected:
   bool IsCodecReconfigureNeeded(const DemuxerConfigs& curr,
                                 const DemuxerConfigs& next) const override;
   ConfigStatus ConfigureInternal() override;
   void OnOutputFormatChanged() override;
   void Render(int buffer_index,
               size_t size,
-              bool render_output,
+              RenderMode render_mode,
               base::TimeDelta pts,
               bool eos_encountered) override;
 
  private:
   // A helper method to set the volume.
   void SetVolumeInternal();
 
   // Recreates |audio_timestamp_helper_|, called when sampling rate is changed.
   void ResetTimestampHelper();
 
@@ skipping 23 matching lines @@
 
   // Reports current playback time to the callee.
   SetTimeCallback update_current_time_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCodecAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_DECODER_H_