| 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 75ed78538cf25eb06b9de6536a6091ef1096bee5..d690a69db9373bfc6ff5c38ed4e063e76f50b179 100644
|
| --- a/content/common/gpu/media/android_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/android_video_decode_accelerator.h
|
| @@ -94,6 +94,8 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
|
|
| ~AndroidVideoDecodeAccelerator() override;
|
|
|
| + // media::VideoDecodeAccelerator implementation:
|
| +
|
| // Does not take ownership of |client| which must outlive |*this|.
|
| bool Initialize(media::VideoCodecProfile profile, Client* client) override;
|
| void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
|
| @@ -102,10 +104,11 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
| void ReusePictureBuffer(int32 picture_buffer_id) override;
|
| void Flush() override;
|
| void Reset() override;
|
| + void SetCdm(int cdm_id) override;
|
| void Destroy() override;
|
| bool CanDecodeOnIOThread() override;
|
|
|
| - // AndroidVideoDecodeStateProvider
|
| + // AVDAStateProvider implementation:
|
| const gfx::Size& GetSize() const override;
|
| const base::ThreadChecker& ThreadChecker() const override;
|
| base::WeakPtr<gpu::gles2::GLES2Decoder> GetGlDecoder() const override;
|
| @@ -159,6 +162,9 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
| // Notifies the client that the decoder was reset.
|
| void NotifyResetDone();
|
|
|
| + // Notifies the client of the CDM setting result.
|
| + void NotifyCdmSet(bool success);
|
| +
|
| // Notifies about decoding errors.
|
| void NotifyError(media::VideoDecodeAccelerator::Error error);
|
|
|
|
|