Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(639)

Unified Diff: media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc

Issue 2824743002: Make V4L2 Jpeg Decode Accelerator not compiled on an Intel device (Closed)
Patch Set: Make V4L2 Jpeg Decode Accelerator not compiled on an Intel device Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/gpu/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc
diff --git a/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc b/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc
index 2bafbeebd11dc9edb24216dc748d8c79ac9d82a4..c2f6090e1434432dc89b6a332ddaf46f4ee9bd0f 100644
--- a/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc
+++ b/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc
@@ -32,10 +32,11 @@
#if defined(ARCH_CPU_X86_FAMILY)
#include "media/gpu/vaapi_jpeg_decode_accelerator.h"
#endif
-#if defined(USE_V4L2_CODEC)
+#if defined(USE_V4L2_CODEC) && defined(ARCH_CPU_ARM_FAMILY)
#include "media/gpu/v4l2_device.h"
#include "media/gpu/v4l2_jpeg_decode_accelerator.h"
#endif
+
#endif
namespace {
@@ -43,7 +44,8 @@ namespace {
std::unique_ptr<media::JpegDecodeAccelerator> CreateV4L2JDA(
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) {
std::unique_ptr<media::JpegDecodeAccelerator> decoder;
-#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC)
+#if defined(OS_CHROMEOS) && defined(USE_V4L2_CODEC) && \
+ defined(ARCH_CPU_ARM_FAMILY)
scoped_refptr<media::V4L2Device> device = media::V4L2Device::Create();
if (device)
decoder.reset(new media::V4L2JpegDecodeAccelerator(
« no previous file with comments | « media/gpu/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698