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

fix some video rotation checks

Browse Source
This commit is contained in:
tibbi 2017-03-26 12:05:38 +02:00
parent 0bead6f1fb
commit 9cca79877b
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,7 +535,7 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
}
mRecorder!!.setPreviewDisplay(mSurfaceHolder.surface)
val rotation = mActivity.getMediaRotation(mCurrCameraId)
val rotation = getVideoRotation()
mInitVideoRotation = rotation
mRecorder!!.setOrientationHint(rotation)
@ -565,10 +565,15 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
return mIsRecording
}
private fun getVideoRotation(): Int {
val deviceRot = MainActivity.mOrientation.compensateDeviceRotation(mCurrCameraId)
val previewRot = mActivity.getPreviewRotation(mCurrCameraId)
return (deviceRot + previewRot) % 360
}
private fun startRecording() {
if (mInitVideoRotation != mActivity.getFinalRotation(mCurrCameraId, MainActivity.mOrientation)) {
cleanupRecorder()
initRecorder()
if (mInitVideoRotation != getVideoRotation()) {
}
try {

14
app/src/main/kotlin/com/simplemobiletools/camera/extensions/activity.kt
View File

@ -19,20 +19,6 @@ fun Activity.getPreviewRotation(cameraId: Int): Int {
return result % 360
}
fun Activity.getMediaRotation(cameraId: Int): Int {
val degrees = getDeviceRotationDegrees()
val info = getCameraInfo(cameraId)
return if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
(360 + info.orientation + degrees) % 360
} else
(360 + info.orientation - degrees) % 360
}
fun Activity.getFinalRotation(currCameraId: Int, deviceOrientation: Int): Int {
var rotation = getMediaRotation(currCameraId)
return rotation % 360
}
fun Activity.getDeviceRotationDegrees() = when (windowManager.defaultDisplay.rotation) {
Surface.ROTATION_90 -> 90
Surface.ROTATION_180 -> 180