fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #172, set SCALER_CROP_REGION at image capturing only if the user zoomed

Browse Source
This commit is contained in:
tibbi
2018-06-18 21:04:01 +02:00
parent 29fc0add5c
commit 7afa969505
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
private val mPreviewToCameraMatrix = Matrix() private val mPreviewToCameraMatrix = Matrix()
private val mCameraOpenCloseLock = Semaphore(1) private val mCameraOpenCloseLock = Semaphore(1)
private val mMediaActionSound = MediaActionSound() private val mMediaActionSound = MediaActionSound()
private var mZoomRect = Rect() private var mZoomRect: Rect? = null
constructor(context: Context) : super(context) constructor(context: Context) : super(context)
@@ -557,8 +557,10 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
setFlashAndExposure(this) setFlashAndExposure(this)
set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE) set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE)
set(CaptureRequest.JPEG_ORIENTATION, mSensorOrientation) set(CaptureRequest.JPEG_ORIENTATION, mSensorOrientation)
set(CaptureRequest.SCALER_CROP_REGION, mZoomRect)
set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_STILL_CAPTURE) set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_STILL_CAPTURE)
if (mZoomRect != null) {
set(CaptureRequest.SCALER_CROP_REGION, mZoomRect)
}
} }
val captureCallback = object : CameraCaptureSession.CaptureCallback() { val captureCallback = object : CameraCaptureSession.CaptureCallback() {
@@ -706,8 +708,10 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
Handler().postDelayed({ Handler().postDelayed({
if (mLastFocusX != 0f && mLastFocusY != 0f) { if (mLastFocusX != 0f && mLastFocusY != 0f) {
if (mCaptureSession != null) {
focusArea(mLastFocusX, mLastFocusY, false) focusArea(mLastFocusX, mLastFocusY, false)
} }
}
}, 200L) }, 200L)
} catch (e: Exception) { } catch (e: Exception) {
} }