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

adding some crashfixes

This commit is contained in:
tibbi 2018-01-12 23:58:01 +01:00
parent 2023cdca50
commit 6d19ddc59d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -398,8 +398,9 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
} }
camera.cancelAutoFocus() camera.cancelAutoFocus()
if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
mParameters!!.focusMode = Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE mParameters!!.focusMode = Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE
}
camera.parameters = mParameters camera.parameters = mParameters
@ -586,7 +587,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
mCamera!!.parameters = mParameters mCamera!!.parameters = mParameters
Handler().postDelayed({ Handler().postDelayed({
mActivity!!.runOnUiThread { mActivity?.runOnUiThread {
mParameters?.flashMode = Camera.Parameters.FLASH_MODE_AUTO mParameters?.flashMode = Camera.Parameters.FLASH_MODE_AUTO
mCamera?.parameters = mParameters mCamera?.parameters = mParameters
} }
@ -619,7 +620,12 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
mCurrVideoPath = mActivity!!.getOutputMediaFile(false) mCurrVideoPath = mActivity!!.getOutputMediaFile(false)
if (mCurrVideoPath.isEmpty()) { if (mCurrVideoPath.isEmpty()) {
mActivity!!.toast(R.string.video_creating_error) mActivity?.toast(R.string.video_creating_error)
return false
}
if (mRecorder == null) {
mActivity?.toast(R.string.unknown_error_occurred)
return false return false
} }
@ -629,6 +635,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
} else { } else {
CamcorderProfile.get(CamcorderProfile.QUALITY_LOW) CamcorderProfile.get(CamcorderProfile.QUALITY_LOW)
} }
profile.apply { profile.apply {
videoFrameWidth = resolution.width videoFrameWidth = resolution.width
videoFrameHeight = resolution.height videoFrameHeight = resolution.height