| Index: content/common/gpu/media/android_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/android_video_decode_accelerator.h b/content/common/gpu/media/android_video_decode_accelerator.h
|
| index 2b41925af47abd2cb04b46d97262b6f4b45502cf..ae299c83f13b0249dcc5b619622141ffd4a996cd 100644
|
| --- a/content/common/gpu/media/android_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/android_video_decode_accelerator.h
|
| @@ -37,16 +37,15 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
| const base::Callback<bool(void)>& make_context_current);
|
|
|
| // media::VideoDecodeAccelerator implementation.
|
| - virtual bool Initialize(media::VideoCodecProfile profile,
|
| - Client* client) override;
|
| - virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
|
| - virtual void AssignPictureBuffers(
|
| + bool Initialize(media::VideoCodecProfile profile, Client* client) override;
|
| + void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
|
| + void AssignPictureBuffers(
|
| const std::vector<media::PictureBuffer>& buffers) override;
|
| - virtual void ReusePictureBuffer(int32 picture_buffer_id) override;
|
| - virtual void Flush() override;
|
| - virtual void Reset() override;
|
| - virtual void Destroy() override;
|
| - virtual bool CanDecodeOnIOThread() override;
|
| + void ReusePictureBuffer(int32 picture_buffer_id) override;
|
| + void Flush() override;
|
| + void Reset() override;
|
| + void Destroy() override;
|
| + bool CanDecodeOnIOThread() override;
|
|
|
| private:
|
| enum State {
|
| @@ -56,7 +55,7 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
|
|
| static const base::TimeDelta kDecodePollDelay;
|
|
|
| - virtual ~AndroidVideoDecodeAccelerator();
|
| + ~AndroidVideoDecodeAccelerator() override;
|
|
|
| // Configures |media_codec_| with the given codec parameters from the client.
|
| bool ConfigureMediaCodec();
|
|
|