Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java

Issue 1702603002: AndroidVideoCapturer getSupportedFormats(): Change interface from JSON string to List/vector (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove logging from C++. Remove json from api.gyp. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
}
« no previous file with comments | « webrtc/api/java/android/org/webrtc/CameraEnumerationAndroid.java ('k') | webrtc/api/java/jni/androidvideocapturer_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698