Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / content / common / gpu / media / gpu_video_encode_accelerator.cc

diff --git a/src/content/common/gpu/media/gpu_video_encode_accelerator.cc b/src/content/common/gpu/media/gpu_video_encode_accelerator.cc
index 3fe89d3..1f4c395 100644 (file)
--- a/src/content/common/gpu/media/gpu_video_encode_accelerator.cc
+++ b/src/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 after http://crbug.com/418762 is fixed.
+  return V4L2VideoEncodeAccelerator::GetSupportedProfilesStatic();
+#endif
   scoped_ptr<media::VideoEncodeAccelerator> encoder = CreateEncoder();
   if (!encoder)
     return std::vector<media::VideoEncodeAccelerator::SupportedProfile>();