Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: content/common/gpu/media/gpu_video_decode_accelerator.cc

Issue 11973010: AndroidVDA by using Android's MediaCodec API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing android_clang build error. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/media/android_video_decode_accelerator.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0bcd54fde401c2ab8394bda8eb0dc3158260c0d2..910537fd41e4ffbab3abf960b897fe2ee79afc3e 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc
@@ -32,6 +32,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"
@@ -205,6 +207,11 @@ void GpuVideoDecodeAccelerator::Initialize(
static_cast<CGLContextObj>(
stub_->decoder()->GetGLContext()->GetHandle()),
this));
+#elif defined(OS_ANDROID)
+ video_decode_accelerator_.reset(new AndroidVideoDecodeAccelerator(
+ this,
+ stub_->decoder()->AsWeakPtr(),
+ make_context_current_));
#else
NOTIMPLEMENTED() << "HW video decode acceleration not available.";
NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
« no previous file with comments | « content/common/gpu/media/android_video_decode_accelerator.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698