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 e6b1f85eedb9714fa270c435e34979113f6ee833..b97beb81768e1c93e26a7e370805ffb1992a98de 100644 |
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc |
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
@@ -29,6 +29,8 @@ |
#elif defined(OS_MACOSX) |
#include "gpu/command_buffer/service/texture_manager.h" |
#include "content/common/gpu/media/mac_video_decode_accelerator.h" |
+#elif defined(OS_ANDROID) |
+#include "content/common/gpu/media/android_video_decode_accelerator.h" |
#endif |
#include "gpu/command_buffer/service/texture_manager.h" |
@@ -192,6 +194,10 @@ void GpuVideoDecodeAccelerator::Initialize( |
static_cast<CGLContextObj>( |
stub_->decoder()->GetGLContext()->GetHandle()), |
this)); |
+#elif defined(OS_ANDROID) |
+ video_decode_accelerator_.reset(new AndroidVideoDecodeAccelerator( |
+ this, |
+ make_context_current_)); |
#else |
NOTIMPLEMENTED() << "HW video decode acceleration not available."; |
NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE); |