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

catch more exceptions at toggling to recording mode

This commit is contained in:
tibbi 2020-12-29 17:45:03 +01:00
parent a713f8aba6
commit f7e0b711cb
1 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt
View File

@ -821,6 +821,7 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview {
mMediaActionSound.play(MediaActionSound.START_VIDEO_RECORDING) mMediaActionSound.play(MediaActionSound.START_VIDEO_RECORDING)
} }
try {
val texture = mTextureView.surfaceTexture val texture = mTextureView.surfaceTexture
texture.setDefaultBufferSize(mPreviewSize!!.width, mPreviewSize!!.height) texture.setDefaultBufferSize(mPreviewSize!!.width, mPreviewSize!!.height)
mPreviewRequestBuilder = mCameraDevice!!.createCaptureRequest(CameraDevice.TEMPLATE_RECORD).apply { mPreviewRequestBuilder = mCameraDevice!!.createCaptureRequest(CameraDevice.TEMPLATE_RECORD).apply {
@ -833,40 +834,10 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview {
surfaces.add(previewSurface) surfaces.add(previewSurface)
mPreviewRequestBuilder!!.addTarget(previewSurface) mPreviewRequestBuilder!!.addTarget(previewSurface)
try {
val recorderSurface = mMediaRecorder!!.surface val recorderSurface = mMediaRecorder!!.surface
surfaces.add(recorderSurface) surfaces.add(recorderSurface)
mPreviewRequestBuilder!!.addTarget(recorderSurface) mPreviewRequestBuilder!!.addTarget(recorderSurface)
} catch (e: Exception) { mCameraDevice!!.createCaptureSession(surfaces, getCameraCaptureCallback(), mBackgroundHandler)
mActivity.showErrorToast(e)
mCameraState = STATE_PREVIEW
return
}
val captureCallback = object : CameraCaptureSession.StateCallback() {
override fun onConfigured(session: CameraCaptureSession) {
mCaptureSession = session
updatePreview()
mIsRecording = true
mActivity.runOnUiThread {
try {
mMediaRecorder?.start()
} catch (e: Exception) {
mActivity.showErrorToast(e)
mCameraState = STATE_PREVIEW
}
}
mActivity.setRecordingState(true)
mCameraState = STATE_RECORDING
}
override fun onConfigureFailed(session: CameraCaptureSession) {
mCameraState = STATE_PREVIEW
}
}
try {
mCameraDevice!!.createCaptureSession(surfaces, captureCallback, mBackgroundHandler)
} catch (e: Exception) { } catch (e: Exception) {
mActivity.showErrorToast(e) mActivity.showErrorToast(e)
mCameraState = STATE_PREVIEW mCameraState = STATE_PREVIEW
@ -900,6 +871,32 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview {
} }
} }
private fun getCameraCaptureCallback(): CameraCaptureSession.StateCallback {
val callback = object : CameraCaptureSession.StateCallback() {
override fun onConfigured(session: CameraCaptureSession) {
mCaptureSession = session
updatePreview()
mIsRecording = true
mActivity.runOnUiThread {
try {
mMediaRecorder?.start()
} catch (e: Exception) {
mActivity.showErrorToast(e)
mCameraState = STATE_PREVIEW
}
}
mActivity.setRecordingState(true)
mCameraState = STATE_RECORDING
}
override fun onConfigureFailed(session: CameraCaptureSession) {
mCameraState = STATE_PREVIEW
}
}
return callback
}
private fun getAvailableVideoSizes(configMap: StreamConfigurationMap) = configMap.getOutputSizes(MediaRecorder::class.java).filter { private fun getAvailableVideoSizes(configMap: StreamConfigurationMap) = configMap.getOutputSizes(MediaRecorder::class.java).filter {
it.width <= MAX_VIDEO_WIDTH && it.height <= MAX_VIDEO_HEIGHT it.width <= MAX_VIDEO_WIDTH && it.height <= MAX_VIDEO_HEIGHT
} }