Compare commits
3 Commits
ivan/fix-a
...
eyenov/pre
Author | SHA1 | Date | |
---|---|---|---|
|
c994506abc | ||
fcf5fe70f3 | |||
|
3a20c44a31 |
@@ -107,47 +107,6 @@ class PreviewView(context: Context, callback: SurfaceHolder.Callback) :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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 containerAspectRatio = containerSize.width.toDouble() / containerSize.height
|
|
||||||
if (!(contentAspectRatio > 0 && containerAspectRatio > 0)) {
|
|
||||||
// One of the aspect ratios is 0 or NaN, maybe the view hasn't been laid out yet.
|
|
||||||
return contentSize
|
|
||||||
}
|
|
||||||
|
|
||||||
val widthOverHeight = when (resizeMode) {
|
|
||||||
ResizeMode.COVER -> contentAspectRatio > containerAspectRatio
|
|
||||||
ResizeMode.CONTAIN -> contentAspectRatio < containerAspectRatio
|
|
||||||
}
|
|
||||||
|
|
||||||
return if (widthOverHeight) {
|
|
||||||
// Scale by width to cover height
|
|
||||||
val scaledWidth = containerSize.height * contentAspectRatio
|
|
||||||
Size(scaledWidth.roundToInt(), containerSize.height)
|
|
||||||
} else {
|
|
||||||
// Scale by height to cover width
|
|
||||||
val scaledHeight = containerSize.width / contentAspectRatio
|
|
||||||
Size(containerSize.width, scaledHeight.roundToInt())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressLint("DrawAllocation")
|
|
||||||
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
|
|
||||||
super.onMeasure(widthMeasureSpec, heightMeasureSpec)
|
|
||||||
|
|
||||||
val measuredViewSize = Size(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(heightMeasureSpec))
|
|
||||||
val surfaceSize = size.rotatedBy(inputOrientation)
|
|
||||||
val fittedSize = getSize(surfaceSize, measuredViewSize, resizeMode)
|
|
||||||
|
|
||||||
Log.i(TAG, "PreviewView is $measuredViewSize rendering $surfaceSize orientation ($orientation). Resizing to: $fittedSize ($resizeMode)")
|
|
||||||
setMeasuredDimension(fittedSize.width, fittedSize.height)
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val TAG = "PreviewView"
|
private const val TAG = "PreviewView"
|
||||||
}
|
}
|
||||||
|
@@ -303,6 +303,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!")
|
||||||
|
@@ -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