content/common/gpu/media/v4l2_video_device.cc - Issue 832383004: Revert of Support multiple video decoders and encoders

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 832383004: Revert of Support multiple video decoders and encoders (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0e97b03b6aee7e7b0ccdb05e77b8e1f9ef51ef7f..59775c3835aef64991243c1fbc2483bb16285323 100644

--- a/content/common/gpu/media/v4l2_video_device.cc

+++ b/content/common/gpu/media/v4l2_video_device.cc

@@ -6,9 +6,7 @@

#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 {

@@ -22,11 +20,9 @@

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>();