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 | 38 |
3 files changed, 31 insertions, 11 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index f8270a6af..c7a0ea8b0 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -4347,6 +4347,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 ab162ac53..02ead1b1c 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -2803,6 +2803,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 17784788e..97ba3287b 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -44,6 +44,7 @@ import android.os.ParcelFileDescriptor; import android.telephony.TelephonyManager; import android.util.DisplayMetrics; import android.util.Log; +import android.util.Range; import android.util.TypedValue; import android.view.Display; import android.view.OrientationEventListener; @@ -60,6 +61,7 @@ import com.android.camera.CameraDisabledException; import com.android.camera.CameraHolder; import com.android.camera.CameraManager; import com.android.camera.CameraSettings; +import com.android.camera.SettingsManager; import com.android.camera.ui.RotateTextToast; import com.android.camera.util.IntentHelper; @@ -69,24 +71,26 @@ import java.io.Closeable; import java.io.IOException; import java.lang.reflect.Method; import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.Date; +import java.util.Iterator; import java.util.List; import java.util.ArrayList; import java.util.Locale; -import android.util.Range; +import java.util.Set; import java.util.StringTokenizer; +import java.util.TreeSet; + -import com.android.camera.SettingsManager; import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCaptureSession; import android.hardware.camera2.params.StreamConfigurationMap; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.utils.SurfaceUtils; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; import static android.content.Context.MODE_PRIVATE; @@ -680,13 +684,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()); } /** |