| 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 75ab36575bf1ae24919e75df4d121c12e599b1a7..4b4018d34923cac2d491e8c1c934c8918b13e513 100644
|
| --- a/media/base/android/media_codec_video_decoder.h
|
| +++ b/media/base/android/media_codec_video_decoder.h
|
| @@ -42,6 +42,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,17 +54,18 @@ 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 offset,
|
| 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;
|
| @@ -75,8 +77,8 @@ class MediaCodecVideoDecoder : public MediaCodecDecoder {
|
| // for later execution.
|
| void ReleaseOutputBuffer(int buffer_index,
|
| base::TimeDelta pts,
|
| - size_t size,
|
| bool render,
|
| + bool update_time,
|
| bool eos_encountered);
|
|
|
| // Data.
|
|
|