| Index: content/common/gpu/media/avda_codec_image.h
|
| diff --git a/content/common/gpu/media/avda_codec_image.h b/content/common/gpu/media/avda_codec_image.h
|
| index 8bbcf13d916af38ce0cfbd8902672e15f696c9f9..720df75c63ce26bbddb82cf630026c147b51154d 100644
|
| --- a/content/common/gpu/media/avda_codec_image.h
|
| +++ b/content/common/gpu/media/avda_codec_image.h
|
| @@ -8,7 +8,10 @@
|
| #include <stdint.h>
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "content/common/gpu/media/avda_shared_state.h"
|
| +#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
|
| +#include "media/base/android/sdk_media_codec_bridge.h"
|
| #include "ui/gl/gl_image.h"
|
|
|
| namespace content {
|
| @@ -56,7 +59,7 @@ class AVDACodecImage : public gl::GLImage {
|
| // Set the size of the current image.
|
| void SetSize(const gfx::Size& size);
|
|
|
| - void SetMediaCodec(media::MediaCodecBridge* codec);
|
| + void SetMediaCodec(media::VideoCodecBridge* codec);
|
|
|
| void SetTexture(gpu::gles2::Texture* texture);
|
|
|
| @@ -84,7 +87,7 @@ class AVDACodecImage : public gl::GLImage {
|
| gfx::Size size_;
|
|
|
| // May be null.
|
| - media::MediaCodecBridge* media_codec_;
|
| + media::VideoCodecBridge* media_codec_;
|
|
|
| const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder_;
|
|
|
|
|