fenix
/
Simple-Camera
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

setup proper preview size

This commit is contained in:
tibbi 2017-03-21 20:19:07 +01:00
parent b34e921200
commit d01a3ca636
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
View File

@ -32,6 +32,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
var mCamera: Camera? = null var mCamera: Camera? = null
private val TAG = Preview::class.java.simpleName private val TAG = Preview::class.java.simpleName
private val FOCUS_AREA_SIZE = 100 private val FOCUS_AREA_SIZE = 100
private val RATIO_TOLERANCE = 0.2f
lateinit var mSurfaceHolder: SurfaceHolder lateinit var mSurfaceHolder: SurfaceHolder
lateinit var mSurfaceView: SurfaceView lateinit var mSurfaceView: SurfaceView
@ -55,7 +56,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
private var mIsSurfaceCreated = false private var mIsSurfaceCreated = false
private var mSwitchToVideoAsap = false private var mSwitchToVideoAsap = false
private var mSetupPreviewAfterMeasure = false private var mSetupPreviewAfterMeasure = false
private val mForceAspectRatio = false private var mIsSixteenToNine = false
private var mWasZooming = false private var mWasZooming = false
private var mLastClickX = 0 private var mLastClickX = 0
private var mLastClickY = 0 private var mLastClickY = 0
@ -133,6 +134,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
mMaxZoom = mParameters!!.maxZoom mMaxZoom = mParameters!!.maxZoom
mZoomRatios = mParameters!!.zoomRatios mZoomRatios = mParameters!!.zoomRatios
mSupportedPreviewSizes = mParameters!!.supportedPreviewSizes.sortedByDescending { it.width * it.height } mSupportedPreviewSizes = mParameters!!.supportedPreviewSizes.sortedByDescending { it.width * it.height }
mIsSixteenToNine = isSixteenToNine()
requestLayout() requestLayout()
invalidate() invalidate()
mSetupPreviewAfterMeasure = true mSetupPreviewAfterMeasure = true
@ -163,6 +165,34 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
return true return true
} }
private fun isSixteenToNine(): Boolean {
val selectedSize = getSelectedResolution()
val selectedRatio = Math.abs(selectedSize.width / selectedSize.height.toFloat())
val checkedRatio = 16 / 9.toFloat()
val diff = Math.abs(selectedRatio - checkedRatio)
return diff < RATIO_TOLERANCE
}
private fun getSelectedResolution(): Camera.Size {
val index = getResolutionIndex()
val resolutions = if (mIsVideoMode) {
mParameters!!.supportedVideoSizes ?: mParameters!!.supportedPreviewSizes
} else {
mParameters!!.supportedPictureSizes
}.sortedByDescending { it.width * it.height }
return resolutions[index]
}
private fun getResolutionIndex(): Int {
val isBackCamera = config.lastUsedCamera == Camera.CameraInfo.CAMERA_FACING_BACK
return if (mIsVideoMode) {
if (isBackCamera) config.backVideoResIndex else config.frontVideoResIndex
} else {
if (isBackCamera) config.backPhotoResIndex else config.frontPhotoResIndex
}
}
fun setTargetUri(uri: Uri) { fun setTargetUri(uri: Uri) {
mTargetUri = uri mTargetUri = uri
} }
@ -388,7 +418,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
if (mSupportedPreviewSizes != null) { if (mSupportedPreviewSizes != null) {
// for simplicity lets assume that most displays are 16:9 and the remaining ones are 4:3 // for simplicity lets assume that most displays are 16:9 and the remaining ones are 4:3
// always set 16:9 for videos as many devices support 4:3 only in low quality // always set 16:9 for videos as many devices support 4:3 only in low quality
if (mForceAspectRatio || mIsVideoMode) { if (mIsSixteenToNine || mIsVideoMode) {
mPreviewSize = getOptimalPreviewSize(mSupportedPreviewSizes!!, mScreenSize.y, mScreenSize.x) mPreviewSize = getOptimalPreviewSize(mSupportedPreviewSizes!!, mScreenSize.y, mScreenSize.x)
} else { } else {
val newRatioHeight = (mScreenSize.x * (4.toDouble() / 3)).toInt() val newRatioHeight = (mScreenSize.x * (4.toDouble() / 3)).toInt()
@ -401,7 +431,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
if (mScreenSize.x > mPreviewSize!!.height) { if (mScreenSize.x > mPreviewSize!!.height) {
val ratio = mScreenSize.x.toFloat() / mPreviewSize!!.height val ratio = mScreenSize.x.toFloat() / mPreviewSize!!.height
lp.width = (mPreviewSize!!.height * ratio).toInt() lp.width = (mPreviewSize!!.height * ratio).toInt()
if (mForceAspectRatio || mIsVideoMode) { if (mIsSixteenToNine || mIsVideoMode) {
lp.height = mScreenSize.y lp.height = mScreenSize.y
} else { } else {
lp.height = (mPreviewSize!!.width * ratio).toInt() lp.height = (mPreviewSize!!.width * ratio).toInt()
@ -436,15 +466,6 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
cleanupRecorder() cleanupRecorder()
mIsRecording = false mIsRecording = false
mIsVideoMode = false mIsVideoMode = false
recheckAspectRatio()
}
private fun recheckAspectRatio() {
if (!mForceAspectRatio) {
mSetupPreviewAfterMeasure = true
invalidate()
requestLayout()
}
} }
// VIDEO RECORDING // VIDEO RECORDING
@ -460,7 +481,6 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
mIsRecording = false mIsRecording = false
mIsVideoMode = true mIsVideoMode = true
recheckAspectRatio()
mRecorder = MediaRecorder() mRecorder = MediaRecorder()
mRecorder!!.setCamera(mCamera) mRecorder!!.setCamera(mCamera)
mRecorder!!.setVideoSource(MediaRecorder.VideoSource.DEFAULT) mRecorder!!.setVideoSource(MediaRecorder.VideoSource.DEFAULT)