Index: webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java |
diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java |
index f40f7e672863010e872481371dbfb2ca2f53c3c5..0690a4cfa331356c4c0846ffc99ccc48a7136b6d 100644 |
--- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java |
+++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java |
@@ -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); |