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

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: Removed android_webview changes. 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
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 "
« no previous file with comments | « media/video/capture/android/imageformat_list.h ('k') | media/video/capture/fake_video_capture_device_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698