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

Unified Diff: content/common/gpu/media/v4l2_video_device.cc

Issue 826663002: Support multiple video decoders and encoders (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address piman's review comments Created 5 years, 11 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
Index: content/common/gpu/media/v4l2_video_device.cc
diff --git a/content/common/gpu/media/v4l2_video_device.cc b/content/common/gpu/media/v4l2_video_device.cc
index 59775c3835aef64991243c1fbc2483bb16285323..0e97b03b6aee7e7b0ccdb05e77b8e1f9ef51ef7f 100644
--- a/content/common/gpu/media/v4l2_video_device.cc
+++ b/content/common/gpu/media/v4l2_video_device.cc
@@ -6,7 +6,9 @@
#include "base/numerics/safe_conversions.h"
#include "content/common/gpu/media/generic_v4l2_video_device.h"
+#if defined(ARCH_CPU_ARMEL)
#include "content/common/gpu/media/tegra_v4l2_video_device.h"
+#endif
namespace content {
@@ -20,9 +22,11 @@ scoped_ptr<V4L2Device> V4L2Device::Create(Type type) {
if (generic_device->Initialize())
return generic_device.Pass();
+#if defined(ARCH_CPU_ARMEL)
scoped_ptr<TegraV4L2Device> tegra_device(new TegraV4L2Device(type));
if (tegra_device->Initialize())
return tegra_device.Pass();
+#endif
LOG(ERROR) << "Failed to create V4L2Device";
return scoped_ptr<V4L2Device>();
« no previous file with comments | « content/common/gpu/media/v4l2_video_decode_accelerator.cc ('k') | content/common/gpu/media/v4l2_video_encode_accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698