| 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 ed455c84bbd88a9c9a9620f426060d71070fc883..8b6de8e91d7b36722fd4d5c5a23eb06382add3c1 100644
|
| --- a/media/base/android/media_codec_video_decoder.h
|
| +++ b/media/base/android/media_codec_video_decoder.h
|
| @@ -44,10 +44,10 @@ class MediaCodecVideoDecoder : public MediaCodecDecoder {
|
| void ReleaseDecoderResources() override;
|
|
|
| // Stores the video surface to use with upcoming Configure()
|
| - void SetPendingSurface(gfx::ScopedJavaSurface surface);
|
| + void SetVideoSurface(gfx::ScopedJavaSurface surface);
|
|
|
| // Returns true if there is a video surface to use.
|
| - bool HasPendingSurface() const;
|
| + bool HasVideoSurface() const;
|
|
|
| protected:
|
| bool IsCodecReconfigureNeeded(const DemuxerConfigs& curr,
|
| @@ -62,7 +62,7 @@ class MediaCodecVideoDecoder : public MediaCodecDecoder {
|
| bool eos_encountered) override;
|
|
|
| int NumDelayedRenderTasks() const override;
|
| - void ReleaseDelayedBuffers() override;
|
| + void ClearDelayedBuffers(bool release) override;
|
|
|
| #ifndef NDEBUG
|
| void VerifyUnitIsKeyFrame(const AccessUnit* unit) const override;
|
|
|