media/base/android/java/src/org/chromium/media/VideoCaptureTango.java - Issue 1014943005: Android CaptureAPI Types

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: media/base/android/java/src/org/chromium/media/VideoCaptureTango.java

Issue 1014943005: Android CaptureAPI Types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added MediaInternalsVideoCaptureDeviceTest.* Created 5 years, 9 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

« media/base/android/java/src/org/chromium/media/VideoCaptureCamera2.java ('K') | « media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java ('k') | media/media.gyp » ('j') | media/media.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/java/src/org/chromium/media/VideoCaptureTango.java

diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java b/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java

index f802f2984da01cadcb81c6ab466b4273cc0ac766..10c23bd7f2294df800de805514bdee8024d72e0e 100644

--- a/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java

+++ b/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java

@@ -67,6 +67,12 @@ public class VideoCaptureTango extends VideoCaptureCamera {

return CAM_PARAMS.length;

}

+ static int getCaptureApiType(int index) {

+ if (index >= CAM_PARAMS.length)

+ return CaptureApiType.API_TYPE_UNKNOWN;

mcasas 2015/03/19 01:55:14 If it's not Tango, it's Camera API 1.

emircan 2015/03/19 19:52:23 Done.

+ return CaptureApiType.TANGO;

+ }

static String getName(int index) {

if (index >= CAM_PARAMS.length) return "";

return CAM_PARAMS[index].mName;