media/video/capture/android/video_capture_device_factory_android.cc - 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/video/capture/android/video_capture_device_factory_android.cc

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/video/capture/android/imageformat_list.h ('K') | « media/video/capture/android/imageformat_list.h ('k') | media/video/capture/video_capture_device.h » ('j') | media/video/capture/video_capture_device.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/android/video_capture_device_factory_android.cc

diff --git a/media/video/capture/android/video_capture_device_factory_android.cc b/media/video/capture/android/video_capture_device_factory_android.cc

index 828c3765e868b73944beb011058835850d15db6b..9516865cc75aa116212e8b96d66301b8f9dfc44f 100644

--- a/media/video/capture/android/video_capture_device_factory_android.cc

+++ b/media/video/capture/android/video_capture_device_factory_android.cc

@@ -71,9 +71,14 @@ void VideoCaptureDeviceFactoryAndroid::GetDeviceNames(

if (device_name.obj() == NULL)

continue;

+ const int capture_api_type =

+ Java_VideoCaptureFactory_getCaptureApiType(env, camera_id, context);

VideoCaptureDevice::Name name(

base::android::ConvertJavaStringToUTF8(device_name),

- base::IntToString(camera_id));

+ base::IntToString(camera_id),

+ static_cast<VideoCaptureDevice::Name::CaptureApiType>(

+ capture_api_type));

device_names->push_back(name);

DVLOG(1) << "VideoCaptureDeviceFactoryAndroid::GetDeviceNames: camera "