Gross way of getting android preview view to respect orientation

This commit is contained in:
Ivan Malison 2024-07-28 20:09:59 -06:00
parent 7c162fecb1
commit d46aeaec4f
4 changed files with 21 additions and 3 deletions

View File

@ -72,6 +72,13 @@ class CameraView(context: Context) :
var zoom: Float = 1f // in "factor" var zoom: Float = 1f // in "factor"
var exposure: Double = 1.0 var exposure: Double = 1.0
var orientation: Orientation = Orientation.PORTRAIT var orientation: Orientation = Orientation.PORTRAIT
set(value) {
field = value
previewView.config?.let {
it.orientation = value
}
previewView.requestLayout()
}
var enableZoomGesture = false var enableZoomGesture = false
set(value) { set(value) {
field = value field = value

View File

@ -10,6 +10,7 @@ import com.mrousavy.camera.types.CodeScannerOptions
import com.mrousavy.camera.types.Orientation import com.mrousavy.camera.types.Orientation
import com.mrousavy.camera.types.PixelFormat import com.mrousavy.camera.types.PixelFormat
import com.mrousavy.camera.types.ResizeMode import com.mrousavy.camera.types.ResizeMode
import android.util.Log
import com.mrousavy.camera.types.Torch import com.mrousavy.camera.types.Torch
import com.mrousavy.camera.types.VideoStabilizationMode import com.mrousavy.camera.types.VideoStabilizationMode
@ -182,6 +183,7 @@ class CameraViewManager : ViewGroupManager<CameraView>() {
fun setOrientation(view: CameraView, orientation: String?) { fun setOrientation(view: CameraView, orientation: String?) {
if (orientation != null) { if (orientation != null) {
val newMode = Orientation.fromUnionValue(orientation) val newMode = Orientation.fromUnionValue(orientation)
Log.i(TAG, "Orientation set to: $newMode")
view.orientation = newMode view.orientation = newMode
} else { } else {
view.orientation = Orientation.PORTRAIT view.orientation = Orientation.PORTRAIT

View File

@ -191,7 +191,7 @@ class CameraSession(private val context: Context, private val cameraManager: Cam
Log.i(TAG, "PreviewView Surface destroyed! ${holder.surface}") Log.i(TAG, "PreviewView Surface destroyed! ${holder.surface}")
destroyPreviewOutputSync() destroyPreviewOutputSync()
} }
} }, configuration
) )
this.previewView = previewView this.previewView = previewView
return previewView return previewView
@ -312,8 +312,9 @@ class CameraSession(private val context: Context, private val cameraManager: Cam
enableHdr enableHdr
) )
outputs.add(output) outputs.add(output)
// Size is usually landscape, so we flip it here
previewView?.setSurfaceSize(size.width, size.height, deviceDetails.sensorOrientation) previewView?.setSurfaceSize(size.width, size.height, deviceDetails.sensorOrientation)
previewView?.config = configuration
} }
// CodeScanner Output // CodeScanner Output

View File

@ -17,7 +17,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@SuppressLint("ViewConstructor") @SuppressLint("ViewConstructor")
class PreviewView(context: Context, callback: SurfaceHolder.Callback) : class PreviewView(context: Context, callback: SurfaceHolder.Callback, var config: CameraConfiguration?) :
SurfaceView(context), SurfaceView(context),
SurfaceHolder.Callback { SurfaceHolder.Callback {
var size: Size = CameraDeviceDetails.getMaximumPreviewSize() var size: Size = CameraDeviceDetails.getMaximumPreviewSize()
@ -101,8 +101,16 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
} }
private fun getSize(contentSize: Size, containerSize: Size, resizeMode: ResizeMode): Size { private fun getSize(contentSize: Size, containerSize: Size, resizeMode: ResizeMode): Size {
var contentSize = contentSize
val orientation = config?.orientation
// Swap dimensions if orientation is landscape
if (orientation?.isLandscape() == true) {
contentSize = Size(contentSize.height, contentSize.width)
}
val contentAspectRatio = contentSize.width.toDouble() / contentSize.height val contentAspectRatio = contentSize.width.toDouble() / contentSize.height
val containerAspectRatio = containerSize.width.toDouble() / containerSize.height val containerAspectRatio = containerSize.width.toDouble() / containerSize.height
Log.i(TAG, "Getting size: $contentSize -> $containerSize, orientation: $orientation")
if (!(contentAspectRatio > 0 && containerAspectRatio > 0)) { if (!(contentAspectRatio > 0 && containerAspectRatio > 0)) {
// One of the aspect ratios is 0 or NaN, maybe the view hasn't been laid out yet. // One of the aspect ratios is 0 or NaN, maybe the view hasn't been laid out yet.
return contentSize return contentSize