| Index: content/common/gpu/media/mac_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/mac_video_decode_accelerator.h b/content/common/gpu/media/mac_video_decode_accelerator.h
|
| index 2194a7ff8bc8d2d870a05a935542b3a8420c0ba4..f4b92f29d26ee3ec24cd7300ac06eca70f89529e 100644
|
| --- a/content/common/gpu/media/mac_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/mac_video_decode_accelerator.h
|
| @@ -31,14 +31,10 @@ class MacVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
|
| // Set the OpenGL context to use.
|
| void SetGLContext(void* gl_context);
|
|
|
| - // Set extra data required to initialize the H.264 video decoder.
|
| - // TODO(sail): Move this into Initialize.
|
| - bool SetConfigInfo(uint32_t frame_width,
|
| - uint32_t frame_height,
|
| - const std::vector<uint8_t>& avc_data);
|
| -
|
| // media::VideoDecodeAccelerator implementation.
|
| - virtual bool Initialize(media::VideoCodecProfile profile) OVERRIDE;
|
| + virtual bool Initialize(media::VideoCodecProfile profile,
|
| + const gfx::Size& frame_size,
|
| + const std::vector<uint8_t>& extra_data) OVERRIDE;
|
| virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
|
| virtual void AssignPictureBuffers(
|
| const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
|
|
|