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

Unified Diff: media/video/capture/android/video_capture_device_factory_android.cc

Issue 602063002: Android Video Capture: Removed references to Android.Hardware.Camera from the factory and cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: qinmin@ nit and tiny style. Created 6 years, 3 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 | « media/base/android/java/src/org/chromium/media/VideoCaptureTango.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 011e56b006a5daa3ec4dbd6d9557744547e6c4c9..38a72c894c5de5005ad46bb90aeab1717d44cd76 100644
--- a/media/video/capture/android/video_capture_device_factory_android.cc
+++ b/media/video/capture/android/video_capture_device_factory_android.cc
@@ -58,26 +58,22 @@ void VideoCaptureDeviceFactoryAndroid::GetDeviceNames(
JNIEnv* env = AttachCurrentThread();
- int num_cameras = Java_ChromiumCameraInfo_getNumberOfCameras(
+ int num_cameras = Java_VideoCaptureFactory_getNumberOfCameras(
env, base::android::GetApplicationContext());
DVLOG(1) << "VideoCaptureDevice::GetDeviceNames: num_cameras=" << num_cameras;
if (num_cameras <= 0)
return;
for (int camera_id = num_cameras - 1; camera_id >= 0; --camera_id) {
- ScopedJavaLocalRef<jobject> ci =
- Java_ChromiumCameraInfo_getAt(env, camera_id);
-
VideoCaptureDevice::Name name(
base::android::ConvertJavaStringToUTF8(
- Java_ChromiumCameraInfo_getDeviceName(env, ci.obj())),
- base::StringPrintf("%d", Java_ChromiumCameraInfo_getId(env, ci.obj())));
+ Java_VideoCaptureFactory_getDeviceName(env, camera_id)),
+ base::android::ConvertJavaStringToUTF8(
+ Java_VideoCaptureFactory_getDeviceId(env, camera_id)));
device_names->push_back(name);
- DVLOG(1) << "VideoCaptureDeviceFactoryAndroid::GetDeviceNames: camera"
- << "device_name=" << name.name() << ", unique_id=" << name.id()
- << ", orientation "
- << Java_ChromiumCameraInfo_getOrientation(env, ci.obj());
+ DVLOG(1) << "VideoCaptureDeviceFactoryAndroid::GetDeviceNames: camera "
+ << "device_name=" << name.name() << ", unique_id=" << name.id();
}
}
« no previous file with comments | « media/base/android/java/src/org/chromium/media/VideoCaptureTango.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698