Chromium Code Reviews| Index: content/public/renderer/video_encode_accelerator.cc |
| diff --git a/content/public/renderer/video_encode_accelerator.cc b/content/public/renderer/video_encode_accelerator.cc |
| index 3a28df7ff6e5c3d1d153222985bf5c68325dd6aa..ade634c705d4e755cfa90c9d419a95f089fce168 100644 |
| --- a/content/public/renderer/video_encode_accelerator.cc |
| +++ b/content/public/renderer/video_encode_accelerator.cc |
| @@ -34,6 +34,12 @@ void CreateVideoEncodeAccelerator( |
| media::VideoEncodeAccelerator::SupportedProfiles |
| GetSupportedVideoEncodeAcceleratorProfiles() { |
| + // In https://crbug.com/664652, H264 HW accelerator is enabled on Android for |
| + // RTC by Default. Keep HW accelerator disalbed for Cast as before at present. |
|
Avi (use Gerrit)
2016/12/13 21:34:56
typo: disabled
|
| +#if defined(OS_ANDROID) |
| + return media::VideoEncodeAccelerator::SupportedProfiles(); |
| +#endif // defined(OS_ANDROID) |
|
Avi (use Gerrit)
2016/12/13 21:34:56
Do #else and enclose the other block.
|
| + |
| media::GpuVideoAcceleratorFactories* gpu_factories = |
| RenderThreadImpl::current()->GetGpuFactories(); |
| if (!gpu_factories || !gpu_factories->IsGpuVideoAcceleratorEnabled()) |