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

Unified Diff: media/gpu/gpu_video_decode_accelerator_factory.cc

Issue 2813303003: Add AndroidVideoSurfaceChooser to manage overlays. (Closed)
Patch Set: fixed dereference of base::Optional Created 3 years, 8 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 | « media/gpu/content_video_view_overlay_factory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/gpu_video_decode_accelerator_factory.cc
diff --git a/media/gpu/gpu_video_decode_accelerator_factory.cc b/media/gpu/gpu_video_decode_accelerator_factory.cc
index 74b234100cdd7d9511bc2ee50682f372e5c325ff..5be9617df53671c6d678c6e51dad07aafcd4c4b5 100644
--- a/media/gpu/gpu_video_decode_accelerator_factory.cc
+++ b/media/gpu/gpu_video_decode_accelerator_factory.cc
@@ -29,6 +29,7 @@
#endif
#elif defined(OS_ANDROID)
#include "media/gpu/android_video_decode_accelerator.h"
+#include "media/gpu/android_video_surface_chooser_impl.h"
#include "media/gpu/avda_codec_allocator.h"
#endif
@@ -249,8 +250,10 @@ GpuVideoDecodeAcceleratorFactory::CreateAndroidVDA(
const gpu::GpuPreferences& gpu_preferences) const {
std::unique_ptr<VideoDecodeAccelerator> decoder;
decoder.reset(new AndroidVideoDecodeAccelerator(
- AVDACodecAllocator::GetInstance(), make_context_current_cb_,
- get_gles2_decoder_cb_));
+ AVDACodecAllocator::GetInstance(),
+ base::MakeUnique<AndroidVideoSurfaceChooserImpl>(),
+ make_context_current_cb_, get_gles2_decoder_cb_,
+ AndroidVideoDecodeAccelerator::PlatformConfig::CreateDefault()));
return decoder;
}
#endif
« no previous file with comments | « media/gpu/content_video_view_overlay_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698