Chromium Code Reviews| 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 38a72c894c5de5005ad46bb90aeab1717d44cd76..c5439d66ffeab395aaa5e48199479df68beb2991 100644 |
| --- a/media/video/capture/android/video_capture_device_factory_android.cc |
| +++ b/media/video/capture/android/video_capture_device_factory_android.cc |
| @@ -65,11 +65,14 @@ void VideoCaptureDeviceFactoryAndroid::GetDeviceNames( |
| return; |
| for (int camera_id = num_cameras - 1; camera_id >= 0; --camera_id) { |
| + base::android::ScopedJavaLocalRef<jstring> device_name = |
| + Java_VideoCaptureFactory_getDeviceName(env, camera_id); |
| + if (device_name.obj() == NULL) |
| + continue; |
| + std::string device_id = base::IntToString(camera_id); |
| + |
| VideoCaptureDevice::Name name( |
| - base::android::ConvertJavaStringToUTF8( |
| - Java_VideoCaptureFactory_getDeviceName(env, camera_id)), |
| - base::android::ConvertJavaStringToUTF8( |
| - Java_VideoCaptureFactory_getDeviceId(env, camera_id))); |
| + base::android::ConvertJavaStringToUTF8(device_name), device_id); |
|
mcasas
2014/10/20 11:33:42
nit: I would use here base::IntToString(camera_id)
qinmin
2014/10/20 17:46:23
Done.
|
| device_names->push_back(name); |
| DVLOG(1) << "VideoCaptureDeviceFactoryAndroid::GetDeviceNames: camera " |