| Index: content/common/gpu/media/omx_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/omx_video_decode_accelerator.h b/content/common/gpu/media/omx_video_decode_accelerator.h
|
| index b74406854aeb7a107647772a6ebb612ad4a17c6d..d76cc5eaf31872646578917d1829ac40c78670b0 100644
|
| --- a/content/common/gpu/media/omx_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/omx_video_decode_accelerator.h
|
| @@ -42,7 +42,7 @@ class OmxVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
|
| OmxVideoDecodeAccelerator(media::VideoDecodeAccelerator::Client* client);
|
|
|
| // media::VideoDecodeAccelerator implementation.
|
| - bool Initialize(const std::vector<int32>& config) OVERRIDE;
|
| + bool Initialize(Profile profile) OVERRIDE;
|
| void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
|
| virtual void AssignPictureBuffers(
|
| const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
|
| @@ -82,9 +82,6 @@ class OmxVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
|
| };
|
| typedef std::map<int32, OutputPicture> OutputPictureById;
|
|
|
| - // Verify that |config| is compatible with this class and hardware.
|
| - bool VerifyConfigs(const std::vector<int32>& configs);
|
| -
|
| MessageLoop* message_loop_;
|
| OMX_HANDLETYPE component_handle_;
|
|
|
| @@ -185,7 +182,7 @@ class OmxVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
|
| Client* client_;
|
|
|
| // These two members are only used during Initialization.
|
| - // OMX_VIDEO_AVCProfile requested during Initialization.
|
| + // OMX_AVCProfile requested during Initialization.
|
| uint32 profile_;
|
| bool component_name_is_nvidia_h264ext_;
|
|
|
|
|