summaryrefslogtreecommitdiffstats
path: root/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
diff options
context:
space:
mode:
Diffstat (limited to 'camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java')
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
index ceab7fe..4558fe3 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
@@ -17,17 +17,27 @@
package com.android.ex.camera2.portability;
import android.hardware.Camera;
+import com.android.ex.camera2.portability.debug.Log;
/**
* The subclass of {@link CameraSettings} for Android Camera 1 API.
*/
public class AndroidCameraSettings extends CameraSettings {
+ private static final Log.Tag TAG = new Log.Tag("AndCamSet");
+
private static final String TRUE = "true";
private static final String RECORDING_HINT = "recording-hint";
public AndroidCameraSettings(CameraCapabilities capabilities, Camera.Parameters params) {
+ if (params == null) {
+ Log.w(TAG, "Settings ctor requires a non-null Camera.Parameters.");
+ return;
+ }
+
CameraCapabilities.Stringifier stringifier = capabilities.getStringifier();
+ setSizesLocked(false);
+
// Preview
Camera.Size paramPreviewSize = params.getPreviewSize();
setPreviewSize(new Size(paramPreviewSize.width, paramPreviewSize.height));
@@ -41,10 +51,8 @@ public class AndroidCameraSettings extends CameraSettings {
// Capture: Focus, flash, zoom, exposure, scene mode.
if (capabilities.supports(CameraCapabilities.Feature.ZOOM)) {
setZoomRatio(params.getZoomRatios().get(params.getZoom()) / 100f);
- setZoomIndex(params.getZoom());
} else {
- setZoomRatio(1.0f);
- setZoomIndex(0);
+ setZoomRatio(CameraCapabilities.ZOOM_RATIO_UNZOOMED);
}
setExposureCompensationIndex(params.getExposureCompensation());
setFlashMode(stringifier.flashModeFromString(params.getFlashMode()));