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 0ae03cab8eb1ebea68fd5c2cbc6823efefcca187..feff652c46b210c5f8c06653045abe73018edfd5 100644 |
--- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java |
+++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java |
@@ -17,7 +17,6 @@ import android.os.SystemClock; |
import android.view.Surface; |
import android.view.WindowManager; |
-import org.json.JSONException; |
import org.webrtc.CameraEnumerationAndroid.CaptureFormat; |
import org.webrtc.Logging; |
@@ -284,6 +283,7 @@ public class VideoCapturerAndroid implements |
} |
} |
+ @Override |
public List<CaptureFormat> getSupportedFormats() { |
return CameraEnumerationAndroid.getSupportedFormats(getCurrentCameraId()); |
} |
@@ -294,11 +294,6 @@ public class VideoCapturerAndroid implements |
} |
@Override |
- public String getSupportedFormatsAsJson() throws JSONException { |
- return CameraEnumerationAndroid.getSupportedFormatsAsJson(getCurrentCameraId()); |
- } |
- |
- @Override |
public SurfaceTextureHelper getSurfaceTextureHelper() { |
return surfaceHelper; |
} |