zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid null pointer exception if Android getCameraInfo fails.

Browse Source 
BUG=b/30890971
R=magjed@webrtc.org, sakal@webrtc.org

Review URL: https://codereview.webrtc.org/2250283002 .

Cr-Commit-Position: refs/heads/master@{#13803}
This commit is contained in:
Alex Glaznev
2016-08-17 15:18:17 -07:00
parent d8a72f0ab2
commit 7c0f8ee67a
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java
View File

@ -38,23 +38,30 @@ public class Camera1Enumerator implements CameraEnumerator {
// Returns device names that can be used to create a new VideoCapturerAndroid. // Returns device names that can be used to create a new VideoCapturerAndroid.
@Override @Override
public String[] getDeviceNames() { public String[] getDeviceNames() {
String[] names = new String[android.hardware.Camera.getNumberOfCameras()]; ArrayList<String> namesList = new ArrayList<>();
for (int i = 0; i < android.hardware.Camera.getNumberOfCameras(); ++i) { for (int i = 0; i < android.hardware.Camera.getNumberOfCameras(); ++i) {
names[i] = getDeviceName(i); String name = getDeviceName(i);
if (name != null) {
namesList.add(name);
Logging.d(TAG, "Index: " + i + ". " + name);
} else {
Logging.e(TAG, "Index: " + i + ". Failed to query camera name.");
} }
return names; }
String[] namesArray = new String[namesList.size()];
return namesList.toArray(namesArray);
} }
@Override @Override
public boolean isFrontFacing(String deviceName) { public boolean isFrontFacing(String deviceName) {
android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName)); android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName));
return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT; return info != null && info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT;
} }
@Override @Override
public boolean isBackFacing(String deviceName) { public boolean isBackFacing(String deviceName) {
android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName)); android.hardware.Camera.CameraInfo info = getCameraInfo(getCameraIndex(deviceName));
return info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK; return info != null && info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK;
} }
@Override @Override
@ -163,6 +170,9 @@ public class Camera1Enumerator implements CameraEnumerator {
// camera can not be used. // camera can not be used.
static String getDeviceName(int index) { static String getDeviceName(int index) {
android.hardware.Camera.CameraInfo info = getCameraInfo(index); android.hardware.Camera.CameraInfo info = getCameraInfo(index);
if (info == null) {
return null;
}
String facing = String facing =
(info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT) ? "front" : "back"; (info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT) ? "front" : "back";