fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-02-17 03:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

skip focusing before image capture if the current camera doesnt support focus

Browse Source
This commit is contained in:
tibbi 2018-06-04 21:48:54 +02:00
parent 617ac98e5d
commit 7e0b355438
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt
View File

@ -45,6 +45,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
private var mDownEventAtY = 0f private var mDownEventAtY = 0f
private var mIsFlashSupported = true private var mIsFlashSupported = true
private var mIsZoomSupported = true private var mIsZoomSupported = true
private var mIsFocusSupported = true
private var mIsImageCaptureIntent = false private var mIsImageCaptureIntent = false
private var mIsInVideoMode = false private var mIsInVideoMode = false
private var mUseFrontCamera = false private var mUseFrontCamera = false
@ -252,6 +253,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
mTextureView.setAspectRatio(mPreviewSize!!.height, mPreviewSize!!.width) mTextureView.setAspectRatio(mPreviewSize!!.height, mPreviewSize!!.width)
mIsFlashSupported = characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE) ?: false mIsFlashSupported = characteristics.get(CameraCharacteristics.FLASH_INFO_AVAILABLE) ?: false
mIsZoomSupported = characteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) ?: 0f > 0f mIsZoomSupported = characteristics.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM) ?: 0f > 0f
mIsFocusSupported = characteristics.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES).size > 1
mCameraId = cameraId mCameraId = cameraId
return return
} }
@ -447,9 +449,8 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_CANCEL) set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_CANCEL)
mCaptureSession!!.capture(build(), captureCallbackHandler, mBackgroundHandler) mCaptureSession!!.capture(build(), captureCallbackHandler, mBackgroundHandler)
val characteristics = getCameraCharacteristics()
// touch-to-focus inspired by OpenCamera // touch-to-focus inspired by OpenCamera
val characteristics = getCameraCharacteristics()
if (characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF) >= 1) { if (characteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF) >= 1) {
val focusArea = getFocusArea(x, y) val focusArea = getFocusArea(x, y)
val sensorRect = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE) val sensorRect = characteristics.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE)
@ -571,7 +572,11 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
private fun getCameraCharacteristics(cameraId: String = mCameraId) = getCameraManager().getCameraCharacteristics(cameraId) private fun getCameraCharacteristics(cameraId: String = mCameraId) = getCameraManager().getCameraCharacteristics(cameraId)
private fun takePicture() { private fun takePicture() {
lockFocus() if (mIsFocusSupported) {
lockFocus()
} else {
captureStillPicture()
}
} }
private fun getFlashlightMode() = when (mFlashlightState) { private fun getFlashlightMode() = when (mFlashlightState) {