Compare commits
	
		
			5 Commits
		
	
	
		
			ivan/fix-l
			...
			031aa9d43a
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 031aa9d43a | ||
| fcf5fe70f3 | |||
|  | 3a20c44a31 | ||
| 0329e7976d | |||
| 7c162fecb1 | 
| @@ -133,8 +133,8 @@ android { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   compileOptions { |   compileOptions { | ||||||
|     sourceCompatibility JavaVersion.VERSION_1_8 |     sourceCompatibility JavaVersion.VERSION_17 | ||||||
|     targetCompatibility JavaVersion.VERSION_1_8 |     targetCompatibility JavaVersion.VERSION_17 | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   externalNativeBuild { |   externalNativeBuild { | ||||||
|   | |||||||
| @@ -1,4 +1,3 @@ | |||||||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | <manifest xmlns:android="http://schemas.android.com/apk/res/android"> | ||||||
|           package="com.mrousavy.camera"> |  | ||||||
|  |  | ||||||
| </manifest> | </manifest> | ||||||
|   | |||||||
| @@ -72,6 +72,10 @@ 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.orientation = value | ||||||
|  |       } | ||||||
|   var enableZoomGesture = false |   var enableZoomGesture = false | ||||||
|     set(value) { |     set(value) { | ||||||
|       field = value |       field = value | ||||||
|   | |||||||
| @@ -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 | ||||||
|   | |||||||
| @@ -312,7 +312,7 @@ 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) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -36,6 +36,13 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) : | |||||||
|         updateLayout() |         updateLayout() | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|  |   var orientation: Orientation = Orientation.PORTRAIT | ||||||
|  |       set(value) { | ||||||
|  |         if (field != value) { | ||||||
|  |           Log.i(TAG, "View Orientation changed: $field -> $value") | ||||||
|  |           field = value | ||||||
|  |         } | ||||||
|  |       } | ||||||
|   private var inputOrientation: Orientation = Orientation.LANDSCAPE_LEFT |   private var inputOrientation: Orientation = Orientation.LANDSCAPE_LEFT | ||||||
|     set(value) { |     set(value) { | ||||||
|       if (field != value) { |       if (field != value) { | ||||||
| @@ -101,6 +108,11 @@ 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 | ||||||
|  |     // Swap dimensions if orientation is landscape | ||||||
|  |     if (orientation.isLandscape()) { | ||||||
|  |       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 | ||||||
|     if (!(contentAspectRatio > 0 && containerAspectRatio > 0)) { |     if (!(contentAspectRatio > 0 && containerAspectRatio > 0)) { | ||||||
| @@ -128,11 +140,11 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) : | |||||||
|   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { |   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { | ||||||
|     super.onMeasure(widthMeasureSpec, heightMeasureSpec) |     super.onMeasure(widthMeasureSpec, heightMeasureSpec) | ||||||
|  |  | ||||||
|     val viewSize = Size(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec)) |     val measuredViewSize = Size(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec)) | ||||||
|     val surfaceSize = size.rotatedBy(inputOrientation) |     val surfaceSize = size.rotatedBy(inputOrientation) | ||||||
|     val fittedSize = getSize(surfaceSize, viewSize, resizeMode) |     val fittedSize = getSize(surfaceSize, measuredViewSize, resizeMode) | ||||||
|  |  | ||||||
|     Log.i(TAG, "PreviewView is $viewSize, rendering $surfaceSize content ($inputOrientation). Resizing to: $fittedSize ($resizeMode)") |     Log.i(TAG, "PreviewView is $measuredViewSize rendering $surfaceSize orientation ($orientation). Resizing to: $fittedSize ($resizeMode)") | ||||||
|     setMeasuredDimension(fittedSize.width, fittedSize.height) |     setMeasuredDimension(fittedSize.width, fittedSize.height) | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -304,6 +304,15 @@ public final class CameraView: UIView, CameraSessionDelegate { | |||||||
|     onInitialized([:]) |     onInitialized([:]) | ||||||
|   } |   } | ||||||
|    |    | ||||||
|  |   func onCameraConfigurationChanged(_ configuration: CameraConfiguration?, _ difference: CameraConfiguration.Difference?) { | ||||||
|  |     guard let configuration, let difference else { return } | ||||||
|  |      | ||||||
|  |     if difference.orientationChanged, let connection = previewView.videoPreviewLayer.connection { | ||||||
|  |       let videoPreviewLayer = previewView.videoPreviewLayer | ||||||
|  |       connection.setOrientation(configuration.orientation) | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  |  | ||||||
|   func onCameraStarted() { |   func onCameraStarted() { | ||||||
|     ReactLogger.log(level: .info, message: "Camera started!") |     ReactLogger.log(level: .info, message: "Camera started!") | ||||||
|     guard let onStarted = onStarted else { |     guard let onStarted = onStarted else { | ||||||
|   | |||||||
| @@ -195,6 +195,7 @@ class CameraSession: NSObject, AVCaptureVideoDataOutputSampleBufferDelegate, AVC | |||||||
|           self.delegate?.onSessionInitialized() |           self.delegate?.onSessionInitialized() | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         self.delegate?.onCameraConfigurationChanged(config, difference) | ||||||
|         // After configuring, set this to the new configuration. |         // After configuring, set this to the new configuration. | ||||||
|         self.configuration = config |         self.configuration = config | ||||||
|       } catch { |       } catch { | ||||||
|   | |||||||
| @@ -21,6 +21,8 @@ protocol CameraSessionDelegate: AnyObject { | |||||||
|    Called when the [CameraSession] successfully initializes |    Called when the [CameraSession] successfully initializes | ||||||
|    */ |    */ | ||||||
|   func onSessionInitialized() |   func onSessionInitialized() | ||||||
|  |    | ||||||
|  |   func onCameraConfigurationChanged(_ configuration: CameraConfiguration?, _ difference: CameraConfiguration.Difference?) | ||||||
|   /** |   /** | ||||||
|    Called when the [CameraSession] starts streaming frames. (isActive=true) |    Called when the [CameraSession] starts streaming frames. (isActive=true) | ||||||
|    */ |    */ | ||||||
|   | |||||||
| @@ -32,28 +32,36 @@ extension AVCaptureOutput { | |||||||
|   func setOrientation(_ orientation: Orientation) { |   func setOrientation(_ orientation: Orientation) { | ||||||
|     // Set orientation for each connection |     // Set orientation for each connection | ||||||
|     for connection in connections { |     for connection in connections { | ||||||
|       #if swift(>=5.9) |       connection.setOrientation(orientation) | ||||||
|         if #available(iOS 17.0, *) { |  | ||||||
|           // Camera Sensors are always in landscape rotation (90deg). |  | ||||||
|           // We are setting the target rotation here, so we need to rotate by landscape once. |  | ||||||
|           let cameraOrientation = orientation.rotateBy(orientation: .landscapeLeft) |  | ||||||
|           let degrees = cameraOrientation.toDegrees() |  | ||||||
|  |  | ||||||
|           // TODO: Don't rotate the video output because it adds overhead. Instead just use EXIF flags for the .mp4 file if recording. |  | ||||||
|           //       Does that work when we flip the camera? |  | ||||||
|           if connection.isVideoRotationAngleSupported(degrees) { |  | ||||||
|             connection.videoRotationAngle = degrees |  | ||||||
|           } |  | ||||||
|         } else { |  | ||||||
|           if connection.isVideoOrientationSupported { |  | ||||||
|             connection.videoOrientation = orientation.toAVCaptureVideoOrientation() |  | ||||||
|           } |  | ||||||
|         } |  | ||||||
|       #else |  | ||||||
|         if connection.isVideoOrientationSupported { |  | ||||||
|           connection.videoOrientation = orientation.toAVCaptureVideoOrientation() |  | ||||||
|         } |  | ||||||
|       #endif |  | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | extension AVCaptureConnection { | ||||||
|  |   func setOrientation(_ orientation: Orientation) { | ||||||
|  |     #if swift(>=5.9) | ||||||
|  |       if #available(iOS 17.0, *) { | ||||||
|  |         // Camera Sensors are always in landscape rotation (90deg). | ||||||
|  |         // We are setting the target rotation here, so we need to rotate by landscape once. | ||||||
|  |         let cameraOrientation = orientation.rotateBy(orientation: .landscapeLeft) | ||||||
|  |         let degrees = cameraOrientation.toDegrees() | ||||||
|  |  | ||||||
|  |         // TODO: Don't rotate the video output because it adds overhead. Instead just use EXIF flags for the .mp4 file if recording. | ||||||
|  |         //       Does that work when we flip the camera? | ||||||
|  |         if isVideoRotationAngleSupported(degrees) { | ||||||
|  |           videoRotationAngle = degrees | ||||||
|  |         } | ||||||
|  |       } else { | ||||||
|  |         if isVideoOrientationSupported { | ||||||
|  |           videoOrientation = orientation.toAVCaptureVideoOrientation() | ||||||
|  |         } | ||||||
|  |       } | ||||||
|  |     #else | ||||||
|  |       if isVideoOrientationSupported { | ||||||
|  |         videoOrientation = orientation.toAVCaptureVideoOrientation() | ||||||
|  |       } | ||||||
|  |     #endif | ||||||
|  |   } | ||||||
|  | } | ||||||
|   | |||||||
| @@ -113,5 +113,19 @@ class ViewController: UIViewController { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
|    |    | ||||||
|  |   override func viewWillTransition(to size: CGSize, with coordinator: any UIViewControllerTransitionCoordinator) { | ||||||
|  |     switch UIDevice.current.orientation { | ||||||
|  |     case .landscapeLeft: | ||||||
|  |       cameraView.orientation = "landscape-right" | ||||||
|  |     case .landscapeRight: | ||||||
|  |       cameraView.orientation = "landscape-left" | ||||||
|  |     default: | ||||||
|  |       cameraView.orientation = "portrait" | ||||||
|  |     } | ||||||
|  |      | ||||||
|  |     cameraView.didSetProps([]) | ||||||
|  |     super.viewWillTransition(to: size, with: coordinator) | ||||||
|  |   } | ||||||
|  |    | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user