media/capture/video/android/java/src/org/chromium/media/VideoCaptureAndroid.java - Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

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/capture/video/android/java/src/org/chromium/media/VideoCaptureAndroid.java

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Refactoring of VideoCaptureDeviceFactory interface Created 4 years, 5 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

« content/browser/renderer_host/media/video_capture_manager.cc ('K') | « media/capture/video/android/BUILD.gn ('k') | media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.java » ('j') | media/capture/video/linux/v4l2_capture_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/video/android/java/src/org/chromium/media/VideoCaptureAndroid.java

diff --git a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureAndroid.java b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureAndroid.java

index 92a74404051075e655a9565e644b96816fe8d0b4..c1b93c86c506681812ab4d41cfde09208bfebe3c 100644

--- a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureAndroid.java

+++ b/media/capture/video/android/java/src/org/chromium/media/VideoCaptureAndroid.java

@@ -50,9 +50,9 @@ public class VideoCaptureAndroid extends VideoCaptureCamera {

static int getCaptureApiType(int id) {

if (VideoCaptureCamera.getCameraInfo(id) == null) {

- return CaptureApiType.API_TYPE_UNKNOWN;

+ return VideoCaptureApiType.API_TYPE_UNKNOWN;

}

- return CaptureApiType.API1;

+ return VideoCaptureApiType.ANDROID_API1;

}

static String getName(int id) {