Chromium Code Reviews| Index: content/common/gpu/media/gpu_video_encode_accelerator.cc |
| diff --git a/content/common/gpu/media/gpu_video_encode_accelerator.cc b/content/common/gpu/media/gpu_video_encode_accelerator.cc |
| index 3fe89d3a3a45aa0f5fae2a6bf2886a36fdfdda9d..371c350a3cc255361a23379fe8c44879e0283288 100644 |
| --- a/content/common/gpu/media/gpu_video_encode_accelerator.cc |
| +++ b/content/common/gpu/media/gpu_video_encode_accelerator.cc |
| @@ -165,6 +165,12 @@ void GpuVideoEncodeAccelerator::OnWillDestroyStub() { |
| // static |
| std::vector<media::VideoEncodeAccelerator::SupportedProfile> |
| GpuVideoEncodeAccelerator::GetSupportedProfiles() { |
| +#if defined(OS_CHROMEOS) && defined(USE_X11) && defined(ARCH_CPU_ARMEL) |
| + // This is a work-around for M39 because the video device is not ready at |
| + // boot. |
| + // TODO(wuchengli): remove this. |
|
kcwu
2014/10/14 00:56:58
Please describe the remove condition (or bug id) h
wuchengli
2014/10/14 08:48:46
Done.
|
| + return V4L2VideoEncodeAccelerator::GetSupportedProfilesStatic(); |
| +#endif |
| scoped_ptr<media::VideoEncodeAccelerator> encoder = CreateEncoder(); |
| if (!encoder) |
| return std::vector<media::VideoEncodeAccelerator::SupportedProfile>(); |