| Index: content/renderer/media/renderer_gpu_video_accelerator_factories.h
|
| diff --git a/content/renderer/media/renderer_gpu_video_accelerator_factories.h b/content/renderer/media/renderer_gpu_video_accelerator_factories.h
|
| index dccabfabe81c7de46cb69d479114233a47c8117e..7ca1014c285371b9c714431cbfa5757e4db1f31d 100644
|
| --- a/content/renderer/media/renderer_gpu_video_accelerator_factories.h
|
| +++ b/content/renderer/media/renderer_gpu_video_accelerator_factories.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/synchronization/waitable_event.h"
|
| #include "content/child/thread_safe_sender.h"
|
| #include "content/common/content_export.h"
|
| +#include "gpu/config/gpu_info.h"
|
| #include "media/filters/gpu_video_accelerator_factories.h"
|
| #include "ui/gfx/size.h"
|
|
|
| @@ -63,8 +64,14 @@ class CONTENT_EXPORT RendererGpuVideoAcceleratorFactories
|
| const SkBitmap& pixels) override;
|
| scoped_ptr<base::SharedMemory> CreateSharedMemory(size_t size) override;
|
| scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override;
|
| +
|
| + media::VideoDecodeAccelerator::SupportedResolution
|
| + ConvertGpuToMediaResolution(
|
| + const gpu::VideoDecodeAcceleratorSupportedResolution& gpu_resolution);
|
| + media::VideoDecodeAccelerator::SupportedResolution
|
| + GetVideoDecodeAcceleratorSupportedResolution() override;
|
| std::vector<media::VideoEncodeAccelerator::SupportedProfile>
|
| - GetVideoEncodeAcceleratorSupportedProfiles() override;
|
| + GetVideoEncodeAcceleratorSupportedProfiles() override;
|
|
|
| private:
|
| friend class base::RefCountedThreadSafe<RendererGpuVideoAcceleratorFactories>;
|
|
|