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

adding some crashfixes, show exceptions thrown at starting recording

Browse Source
This commit is contained in:
tibbi 2018-07-05 18:57:10 +02:00
parent f2f330ffd3
commit 9cb353d0b5
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -608,7 +608,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
super.onCaptureCompleted(session, request, result) super.onCaptureCompleted(session, request, result)
if (request.tag == FOCUS_TAG) { if (request.tag == FOCUS_TAG) {
mCaptureSession!!.setRepeatingRequest(mPreviewRequestBuilder!!.build(), mCaptureCallback, mBackgroundHandler) mCaptureSession?.setRepeatingRequest(mPreviewRequestBuilder!!.build(), mCaptureCallback, mBackgroundHandler)
} }
} }
} }
@ -798,24 +798,28 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie
} }
private fun setupMediaRecorder() { private fun setupMediaRecorder() {
val videoSize = getCurrentResolution() try {
mLastVideoPath = mActivity.getOutputMediaFile(false) val videoSize = getCurrentResolution()
val rotation = mActivity.windowManager.defaultDisplay.rotation mLastVideoPath = mActivity.getOutputMediaFile(false)
mMediaRecorder!!.apply { val rotation = mActivity.windowManager.defaultDisplay.rotation
setAudioSource(MediaRecorder.AudioSource.MIC) mMediaRecorder!!.apply {
setVideoSource(MediaRecorder.VideoSource.SURFACE) setAudioSource(MediaRecorder.AudioSource.MIC)
setOutputFormat(MediaRecorder.OutputFormat.MPEG_4) setVideoSource(MediaRecorder.VideoSource.SURFACE)
setOutputFile(mLastVideoPath) setOutputFormat(MediaRecorder.OutputFormat.MPEG_4)
setVideoEncodingBitRate(10000000) setOutputFile(mLastVideoPath)
setVideoFrameRate(30) setVideoEncodingBitRate(10000000)
setVideoSize(videoSize.width, videoSize.height) setVideoFrameRate(30)
setVideoEncoder(MediaRecorder.VideoEncoder.H264) setVideoSize(videoSize.width, videoSize.height)
setAudioEncoder(MediaRecorder.AudioEncoder.AAC) setVideoEncoder(MediaRecorder.VideoEncoder.H264)
when (mSensorOrientation) { setAudioEncoder(MediaRecorder.AudioEncoder.AAC)
90 -> setOrientationHint(DEFAULT_ORIENTATIONS.get(rotation)) when (mSensorOrientation) {
270 -> setOrientationHint(INVERSE_ORIENTATIONS.get(rotation)) 90 -> setOrientationHint(DEFAULT_ORIENTATIONS.get(rotation))
270 -> setOrientationHint(INVERSE_ORIENTATIONS.get(rotation))
}
prepare()
} }
prepare() } catch (e: Exception) {
mActivity.showErrorToast(e)
} }
} }