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

Unified Diff: talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java

Issue 1338033003: Log to webrtc logging stream from java code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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: talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
diff --git a/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java b/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
index c8f9a30024e97f40ba039f803e6b4178eba7b80b..3e37f6afdca3c3be7c164662d3df3a045bf4e686 100644
--- a/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
+++ b/talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java
@@ -30,13 +30,14 @@ package org.webrtc;
import static java.lang.Math.abs;
import static java.lang.Math.ceil;
import android.hardware.Camera;
-import android.util.Log;
import android.graphics.ImageFormat;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.webrtc.Logging;
+
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -145,7 +146,7 @@ public class CameraEnumerationAndroid {
try {
Camera.getCameraInfo(index, info);
} catch (Exception e) {
- Log.e(TAG, "getCameraInfo failed on index " + index,e);
+ Logging.e(TAG, "getCameraInfo failed on index " + index,e);
return null;
}
@@ -177,7 +178,7 @@ public class CameraEnumerationAndroid {
json_format.put("framerate", (format.maxFramerate + 999) / 1000);
json_formats.put(json_format);
}
- Log.d(TAG, "Supported formats for camera " + id + ": "
+ Logging.d(TAG, "Supported formats for camera " + id + ": "
+ json_formats.toString(2));
return json_formats.toString();
}
@@ -196,7 +197,7 @@ public class CameraEnumerationAndroid {
public static int[] getFramerateRange(Camera.Parameters parameters, final int framerate) {
List<int[]> listFpsRange = parameters.getSupportedPreviewFpsRange();
if (listFpsRange.isEmpty()) {
- Log.w(TAG, "No supported preview fps range");
+ Logging.w(TAG, "No supported preview fps range");
return new int[]{0, 0};
}
return Collections.min(listFpsRange,
@@ -227,7 +228,7 @@ public class CameraEnumerationAndroid {
return getDeviceName(i);
}
} catch (Exception e) {
- Log.e(TAG, "getCameraInfo() failed on index " + i, e);
+ Logging.e(TAG, "getCameraInfo() failed on index " + i, e);
}
}
return null;

Powered by Google App Engine
This is Rietveld 408576698