diff options
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 1 | ||||
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 28 |
3 files changed, 26 insertions, 6 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 5e3e58a47..ade3b47cb 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -3645,6 +3645,7 @@ public class PhotoModule doModeSwitch = updateCameraParametersPreference(); } + CameraUtil.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 273ada957..b82192669 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2408,6 +2408,9 @@ public class VideoModule implements CameraModule, int jpegQuality = CameraProfile.getJpegEncodingQualityParameter(mCameraId, CameraProfile.QUALITY_HIGH); mParameters.setJpegQuality(jpegQuality); + + CameraUtil.dumpParameters(mParameters); + //Call Qcom related Camera Parameters qcomSetCameraParameters(); diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 1217cde64..8017849fc 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -65,10 +65,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. @@ -605,13 +609,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()); } /** |