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

Fix a few error prone lines on VideoCapturerAndroid.

Browse Source 
R=pbos@webrtc.org, perkj@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#13164}
This commit is contained in:
Sami Kalliomaki
2016-06-16 14:25:55 +02:00
parent b00dc386d3
commit 5a9e7e0ba0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
View File

@ -178,6 +178,7 @@ public class VideoCapturerAndroid implements
// It does not matter if width and height are flipped. I.E, |width| = 640, |height| = 480 produce
// the same result as |width| = 480, |height| = 640.
// TODO(magjed/perkj): Document what this function does. Change name?
@Override
public void onOutputFormatRequest(final int width, final int height, final int framerate) {
maybePostOnCameraThread(new Runnable() {
@Override public void run() {
@ -188,6 +189,7 @@ public class VideoCapturerAndroid implements
// Reconfigure the camera to capture in a new format. This should only be called while the camera
// is running.
@Override
public void changeCaptureFormat(final int width, final int height, final int framerate) {
maybePostOnCameraThread(new Runnable() {
@Override public void run() {
@ -219,7 +221,7 @@ public class VideoCapturerAndroid implements
if (android.hardware.Camera.getNumberOfCameras() == 0) {
throw new RuntimeException("No cameras available");
}
if (cameraName == null || cameraName == "") {
if (cameraName == null || cameraName.equals("")) {
this.id = 0;
} else {
this.id = CameraEnumerationAndroid.getCameraIndex(cameraName);