Chromium Code Reviews| 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..83594faa7d84dbbfa153fe6757ec692a365dea8b 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" |
|
wuchengli
2014/12/23 03:37:20
remove
henryhsu
2014/12/23 05:52:06
Done.
|
| #include "media/filters/gpu_video_accelerator_factories.h" |
| #include "ui/gfx/size.h" |
| @@ -63,8 +64,11 @@ 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 |
| + GetVideoDecodeAcceleratorSupportedResolution() override; |
| std::vector<media::VideoEncodeAccelerator::SupportedProfile> |
| - GetVideoEncodeAcceleratorSupportedProfiles() override; |
| + GetVideoEncodeAcceleratorSupportedProfiles() override; |
| private: |
| friend class base::RefCountedThreadSafe<RendererGpuVideoAcceleratorFactories>; |