| 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 8384bc801f9991f283ab1d44d96fdd3a280c632b..2e8058af4600187c6df9e2cc83f2738af18cd54f 100644
|
| --- a/content/common/gpu/media/android_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/android_video_decode_accelerator.h
|
| @@ -95,7 +95,7 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
| ~AndroidVideoDecodeAccelerator() override;
|
|
|
| // media::VideoDecodeAccelerator implementation:
|
| - bool Initialize(media::VideoCodecProfile profile, Client* client) override;
|
| + bool Initialize(const Config& config, Client* client) override;
|
| void SetCdm(int cdm_id) override;
|
| void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
|
| void AssignPictureBuffers(
|
| @@ -178,6 +178,9 @@ class CONTENT_EXPORT AndroidVideoDecodeAccelerator
|
| // Codec type. Used when we configure media codec.
|
| media::VideoCodec codec_;
|
|
|
| + // Whether the stream is encrypted.
|
| + bool is_encrypted_;
|
| +
|
| // The current state of this class. For now, this is used only for setting
|
| // error state.
|
| State state_;
|
|
|