Chromium Code Reviews| Index: content/common/gpu/media/gpu_video_decode_accelerator.cc |
| diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
| index 0d94eaa2d80876ff37f0460af66f1350eeb2a575..7bdb3de4c8a6eeefe120ae558edd9c78fab70921 100644 |
| --- a/content/common/gpu/media/gpu_video_decode_accelerator.cc |
| +++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
| @@ -33,6 +33,8 @@ |
| #include "content/common/gpu/media/vaapi_video_decode_accelerator.h" |
| #include "ui/gl/gl_context_glx.h" |
| #include "ui/gl/gl_implementation.h" |
| +#elif defined(USE_OZONE) |
| +#include "media/ozone/ozone_platform.h" |
| #elif defined(OS_ANDROID) |
| #include "content/common/gpu/media/android_video_decode_accelerator.h" |
| #endif |
| @@ -275,6 +277,11 @@ void GpuVideoDecodeAccelerator::Initialize( |
| static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext()); |
| video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator( |
| glx_context->display(), make_context_current_)); |
| +#elif defined(USE_OZONE) |
| + media::OzonePlatformMedia* platform = |
| + media::OzonePlatformMedia::GetInstance(); |
| + video_decode_accelerator_.reset(platform->CreateVideoDecodeFactoryOzone( |
| + make_context_current_)); |
|
spang
2014/06/09 19:17:32
Probably need to check for NULL return here:
if (
vignatti (out of this project)
2014/06/09 20:30:27
Done.
|
| #elif defined(OS_ANDROID) |
| video_decode_accelerator_.reset(new AndroidVideoDecodeAccelerator( |
| stub_->decoder()->AsWeakPtr(), |