diff options
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rw-r--r-- | src/com/android/camera/CaptureModule.java | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 6b9c6869e..7fbabfb95 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -105,11 +105,12 @@ import com.android.camera.ui.CountDownView; import com.android.camera.ui.ModuleSwitcher; import com.android.camera.ui.RotateTextToast; import com.android.camera.ui.TrackingFocusRenderer; +import com.android.camera.util.ApiHelper; import com.android.camera.util.CameraUtil; import com.android.camera.util.PersistUtil; import com.android.camera.util.SettingTranslation; -import com.android.camera.util.ApiHelper; import com.android.camera.util.AccessibilityUtils; +import com.android.camera.util.VendorTagUtil; import com.android.internal.util.MemInfoReader; import org.codeaurora.snapcam.R; @@ -210,26 +211,9 @@ public class CaptureModule implements CameraModule, PhotoController, CaptureRequest.Key<Integer> BayerMonoLinkSessionIdKey = new CaptureRequest.Key<>("org.codeaurora.qcamera3.dualcam_link_meta_data" + ".related_camera_id", Integer.class); - public static CaptureRequest.Key<Integer> CdsModeKey = - new CaptureRequest.Key<>("org.codeaurora.qcamera3.CDS.cds_mode", Integer.class); - public static CaptureRequest.Key<Byte> JpegCropEnableKey = - new CaptureRequest.Key<>("org.codeaurora.qcamera3.jpeg_encode_crop.enable", - Byte.class); - public static CaptureRequest.Key<int[]> JpegCropRectKey = - new CaptureRequest.Key<>("org.codeaurora.qcamera3.jpeg_encode_crop.rect", - int[].class); - public static CaptureRequest.Key<int[]> JpegRoiRectKey = - new CaptureRequest.Key<>("org.codeaurora.qcamera3.jpeg_encode_crop.roi", - int[].class); public static CameraCharacteristics.Key<Byte> MetaDataMonoOnlyKey = new CameraCharacteristics.Key<>("org.codeaurora.qcamera3.sensor_meta_data.is_mono_only", Byte.class); - public static CaptureRequest.Key<Integer> SELECT_PRIORITY = - new CaptureRequest.Key<>("org.codeaurora.qcamera3.iso_exp_priority.select_priority", - Integer.class); - public static CaptureRequest.Key<Long> ISO_EXP = - new CaptureRequest.Key<>("org.codeaurora.qcamera3.iso_exp_priority.use_iso_exp_priority", - Long.class); public static CameraCharacteristics.Key<int[]> InstantAecAvailableModes = new CameraCharacteristics.Key<>("org.codeaurora.qcamera3.instant_aec.instant_aec_available_modes", int[].class); public static final CaptureRequest.Key<Integer> INSTANT_AEC_MODE = @@ -1525,7 +1509,7 @@ public class CaptureModule implements CameraModule, PhotoController, addPreviewSurface(captureBuilder, null, id); captureBuilder.set(CaptureRequest.CONTROL_AF_MODE, mControlAFMode); captureBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest.CONTROL_AF_TRIGGER_IDLE); - captureBuilder.set(CdsModeKey, 2); // CDS 0-OFF, 1-ON, 2-AUTO + VendorTagUtil.setCdsMode(captureBuilder, 2);// CDS 0-OFF, 1-ON, 2-AUTO applySettingsForCapture(captureBuilder, id); if(csEnabled) { @@ -4157,8 +4141,8 @@ public class CaptureModule implements CameraModule, PhotoController, String value = mSettingsManager.getValue(SettingsManager.KEY_ISO); if (value == null) return; if (value.equals("auto")) { - request.set(SELECT_PRIORITY, 0); - request.set(ISO_EXP, 0L); + VendorTagUtil.setIsoExpPrioritySelectPriority(request, 0); + VendorTagUtil.setIsoExpPriority(request, 0L); if (request.get(CaptureRequest.SENSOR_EXPOSURE_TIME) == null) { request.set(CaptureRequest.SENSOR_EXPOSURE_TIME, mIsoExposureTime); } @@ -4167,8 +4151,8 @@ public class CaptureModule implements CameraModule, PhotoController, } } else { long intValue = SettingsManager.KEY_ISO_INDEX.get(value); - request.set(SELECT_PRIORITY, 0); - request.set(ISO_EXP, intValue); + VendorTagUtil.setIsoExpPrioritySelectPriority(request, 0); + VendorTagUtil.setIsoExpPriority(request, intValue); if (request.get(CaptureRequest.SENSOR_EXPOSURE_TIME) != null) { mIsoExposureTime = request.get(CaptureRequest.SENSOR_EXPOSURE_TIME); } |