Index: content/common/gpu/media/gpu_jpeg_decode_accelerator.cc |
diff --git a/content/common/gpu/media/gpu_jpeg_decode_accelerator.cc b/content/common/gpu/media/gpu_jpeg_decode_accelerator.cc |
index 94cd88e0cadfca066f8e69341a21cfc7f62c684d..4e5948a8aa662fbf69b64b546125eed50b95b16f 100644 |
--- a/content/common/gpu/media/gpu_jpeg_decode_accelerator.cc |
+++ b/content/common/gpu/media/gpu_jpeg_decode_accelerator.cc |
@@ -20,6 +20,9 @@ |
#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
wuchengli
2015/05/25 10:29:23
#if defined(OS_CHROMEOS)
#if defined(ARCH_CPU_X8
henryhsu
2015/06/05 03:28:55
Done.
|
#include "content/common/gpu/media/vaapi_jpeg_decode_accelerator.h" |
+#elif defined(USE_V4L2_CODEC) |
+#include "content/common/gpu/media/v4l2_device.h" |
+#include "content/common/gpu/media/v4l2_jpeg_decode_accelerator.h" |
#endif |
namespace base { |
@@ -112,6 +115,14 @@ bool GpuJpegDecodeAccelerator::Initialize() { |
#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) |
jpeg_decode_accelerator_.reset( |
new VaapiJpegDecodeAccelerator(io_message_loop_)); |
+#elif defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC) |
+ scoped_refptr<V4L2Device> device = V4L2Device::Create( |
+ V4L2Device::kJpegDecoder); |
+ if (device.get()) { |
+ jpeg_decode_accelerator_.reset(new V4L2JpegDecodeAccelerator( |
+ device, |
+ io_message_loop_)); |
+ } |
#else |
DVLOG(1) << "HW JPEG decode acceleration not available."; |
return false; |