Index: media/base/android/media_codec_video_decoder.h |
diff --git a/media/base/android/media_codec_video_decoder.h b/media/base/android/media_codec_video_decoder.h |
index 8b6de8e91d7b36722fd4d5c5a23eb06382add3c1..cc784e4a0b4a20cae8e3de725c37d08b3422e141 100644 |
--- a/media/base/android/media_codec_video_decoder.h |
+++ b/media/base/android/media_codec_video_decoder.h |
@@ -30,6 +30,7 @@ class MediaCodecVideoDecoder : 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, |
@@ -42,6 +43,7 @@ class MediaCodecVideoDecoder : public MediaCodecDecoder { |
bool HasStream() const override; |
void SetDemuxerConfigs(const DemuxerConfigs& configs) override; |
void ReleaseDecoderResources() override; |
+ void ReleaseMediaCodec() override; |
// Stores the video surface to use with upcoming Configure() |
void SetVideoSurface(gfx::ScopedJavaSurface surface); |
@@ -53,16 +55,17 @@ class MediaCodecVideoDecoder : public MediaCodecDecoder { |
bool IsCodecReconfigureNeeded(const DemuxerConfigs& curr, |
const DemuxerConfigs& next) const override; |
ConfigStatus ConfigureInternal() override; |
- void SynchronizePTSWithTime(base::TimeDelta current_time) override; |
+ void AssociateCurrentTimeWithPTS(base::TimeDelta pts) override; |
+ void DissociatePTSFromTime() 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; |
int NumDelayedRenderTasks() const override; |
- void ClearDelayedBuffers(bool release) override; |
+ void ReleaseDelayedBuffers() override; |
#ifndef NDEBUG |
void VerifyUnitIsKeyFrame(const AccessUnit* unit) const override; |