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

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

Issue 1822983002: Support external buffer import in VDA interface and add a V4L2SVDA impl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.cc
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.cc b/content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.cc
index 04ab770fa89ab44f6cb792af2069eb3c66d69d01..261cd12d73a7ac96b047b97089882da53c374310 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.cc
+++ b/content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.cc
@@ -29,13 +29,6 @@
namespace content {
-namespace {
-static base::WeakPtr<gpu::gles2::GLES2Decoder> GetEmptyGLES2Decoder() {
- NOTREACHED() << "VDA requests a GLES2Decoder, but client did not provide it";
- return base::WeakPtr<gpu::gles2::GLES2Decoder>();
-}
-}
-
// static
scoped_ptr<GpuVideoDecodeAcceleratorFactoryImpl>
GpuVideoDecodeAcceleratorFactoryImpl::Create(
@@ -44,7 +37,7 @@ GpuVideoDecodeAcceleratorFactoryImpl::Create(
const BindGLImageCallback& bind_image_cb) {
return make_scoped_ptr(new GpuVideoDecodeAcceleratorFactoryImpl(
get_gl_context_cb, make_context_current_cb, bind_image_cb,
- base::Bind(&GetEmptyGLES2Decoder)));
+ GetGLES2DecoderCallback()));
}
// static
@@ -60,6 +53,13 @@ GpuVideoDecodeAcceleratorFactoryImpl::CreateWithGLES2Decoder(
}
// static
+scoped_ptr<GpuVideoDecodeAcceleratorFactoryImpl>
+GpuVideoDecodeAcceleratorFactoryImpl::CreateWithNoGL() {
+ return Create(GetGLContextCallback(), MakeGLContextCurrentCallback(),
+ BindGLImageCallback());
+}
+
+// static
gpu::VideoDecodeAcceleratorCapabilities
GpuVideoDecodeAcceleratorFactoryImpl::GetDecoderCapabilities(
const gpu::GpuPreferences& gpu_preferences) {

Powered by Google App Engine
This is Rietveld 408576698