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 2bab173172258ee37150897fcf6ab5848ca0d954..5adb895b0599444964fa5d292acecf1b0322b076 100644 |
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc |
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
@@ -183,7 +183,8 @@ GpuVideoDecodeAccelerator::GetCapabilities( |
capabilities.supported_profiles = |
VTVideoDecodeAccelerator::GetSupportedProfiles(); |
#elif defined(OS_ANDROID) |
- capabilities = AndroidVideoDecodeAccelerator::GetCapabilities(); |
+ capabilities = |
+ AndroidVideoDecodeAccelerator::GetCapabilities(gpu_preferences); |
#endif |
return GpuVideoAcceleratorUtil::ConvertMediaToGpuDecodeCapabilities( |
capabilities); |
@@ -494,8 +495,11 @@ GpuVideoDecodeAccelerator::CreateOzoneVDA() { |
#if defined(OS_ANDROID) |
scoped_ptr<media::VideoDecodeAccelerator> |
GpuVideoDecodeAccelerator::CreateAndroidVDA() { |
+ const gpu::GpuPreferences& gpu_preferences = |
DaleCurtis
2016/03/21 16:15:55
Does this need to be passed in here or is this som
william.xie
2016/03/22 01:09:24
Done.
|
+ stub_->channel()->gpu_channel_manager()->gpu_preferences(); |
return make_scoped_ptr<media::VideoDecodeAccelerator>( |
new AndroidVideoDecodeAccelerator(stub_->decoder()->AsWeakPtr(), |
+ gpu_preferences, |
make_context_current_)); |
} |
#endif |