diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-10-14 12:25:08 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-12-14 23:48:43 -0500 |
| commit | fb7bc94ea54fb0042ea0aa662f60633afbbe3283 (patch) | |
| tree | f8fe120fff0990eb6d217149c15dc0968253ea4b | |
| parent | 079ee4cd575b6c53c0e97ba110cdeca55cab0190 (diff) | |
| download | android_packages_apps_Camera2-fb7bc94ea54fb0042ea0aa662f60633afbbe3283.tar.gz android_packages_apps_Camera2-fb7bc94ea54fb0042ea0aa662f60633afbbe3283.tar.bz2 android_packages_apps_Camera2-fb7bc94ea54fb0042ea0aa662f60633afbbe3283.zip | |
camera: Add parameter debugging support
Change-Id: Ifc1653f0046af169ba36d94796b4d9a3055c6798
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 28 |
3 files changed, 27 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 128c8b876..c3ce4999c 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2619,6 +2619,7 @@ public class PhotoModule doModeSwitch = updateCameraParametersPreference(); } + Util.dumpParameters(mParameters); mCameraDevice.setParameters(mParameters); // Switch to gcam module if HDR+ was selected diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index a87786a29..e54944a76 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1902,9 +1902,13 @@ public class VideoModule implements CameraModule, int jpegQuality = CameraProfile.getJpegEncodingQualityParameter(mCameraId, CameraProfile.QUALITY_HIGH); mParameters.setJpegQuality(jpegQuality); + + Util.dumpParameters(mParameters); + //Call Qcom related Camera Parameters qcomSetCameraParameters(); mCameraDevice.setParameters(mParameters); + // Keep preview size up to date. mParameters = mCameraDevice.getParameters(); diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 68211d648..4f2c7b788 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -64,10 +64,14 @@ import java.io.Closeable; import java.io.IOException; import java.lang.reflect.Method; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; +import java.util.Iterator; import java.util.List; import java.util.Locale; +import java.util.Set; import java.util.StringTokenizer; +import java.util.TreeSet; /** * Collection of utility functions used in this package. @@ -563,13 +567,25 @@ public class CameraUtil { return optimalSize; } - public static void dumpParameters(Parameters parameters) { - String flattened = parameters.flatten(); - StringTokenizer tokenizer = new StringTokenizer(flattened, ";"); - Log.d(TAG, "Dump all camera parameters:"); - while (tokenizer.hasMoreElements()) { - Log.d(TAG, tokenizer.nextToken()); + public static void dumpParameters(Parameters params) { + Set<String> sortedParams = new TreeSet<String>(); + sortedParams.addAll(Arrays.asList(params.flatten().split(";"))); + StringBuilder sb = new StringBuilder(); + sb.append("["); + Iterator<String> i = sortedParams.iterator(); + while (i.hasNext()) { + String nextParam = i.next(); + if ((sb.length() + nextParam.length()) > 2044) { + Log.d(TAG, "Parameters: " + sb.toString()); + sb = new StringBuilder(); + } + sb.append(nextParam); + if (i.hasNext()) { + sb.append(", "); + } } + sb.append("]"); + Log.d(TAG, "Parameters: " + sb.toString()); } /** |