From fb425458904eb240466768be08352973fd2f78d8 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 31 Jan 2024 16:26:17 -0700
Subject: [PATCH] some camera orientation stuff, maybe toss?

---
 .../mrousavy/camera/core/ChunkedRecorder.kt   | 21 ++++++++-----------
 .../mrousavy/camera/core/RecordingSession.kt  |  6 +++---
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/package/android/src/main/java/com/mrousavy/camera/core/ChunkedRecorder.kt b/package/android/src/main/java/com/mrousavy/camera/core/ChunkedRecorder.kt
index 0814f11..5d08166 100644
--- a/package/android/src/main/java/com/mrousavy/camera/core/ChunkedRecorder.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/core/ChunkedRecorder.kt
@@ -12,7 +12,6 @@ import com.mrousavy.camera.types.Orientation
 import com.mrousavy.camera.types.RecordVideoOptions
 import java.io.File
 import java.nio.ByteBuffer
-import kotlinx.coroutines.*
 
 class ChunkedRecordingManager(private val encoder: MediaCodec, private val outputDirectory: File, private val orientationHint: Int, private val iFrameInterval: Int) :
   MediaCodec.Callback() {
@@ -23,22 +22,20 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
       size: Size,
       enableAudio: Boolean,
       fps: Int? = null,
-      orientation: Orientation,
+      cameraOrientation: Orientation,
       bitRate: Int,
       options: RecordVideoOptions,
       outputDirectory: File,
       iFrameInterval: Int = 3
     ): ChunkedRecordingManager {
       val mimeType = options.videoCodec.toMimeType()
-      var width = size.width
-      var height = size.height
-
-      val orientationDegrees = orientation.toDegrees()
-
-      if (orientationDegrees == 90 || orientationDegrees == 270) {
-        width = size.height
-        height = size.width
+      val orientationDegrees = cameraOrientation.toDegrees()
+      val (width, height) = if (cameraOrientation.isLandscape()) {
+        size.height to size.width
+      } else {
+        size.width to size.height
       }
+
       val format = MediaFormat.createVideoFormat(mimeType, width, height)
 
       val codec = MediaCodec.createEncoderByType(mimeType)
@@ -56,11 +53,11 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
       format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, iFrameInterval)
       format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate)
 
-      Log.i(TAG, "Video Format: $format")
+      Log.i(TAG, "Video Format: $format, orientation $cameraOrientation")
       // Create a MediaCodec encoder, and configure it with our format.  Get a Surface
       // we can use for input and wrap it with a class that handles the EGL work.
       codec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE)
-      return ChunkedRecordingManager(codec, outputDirectory, orientationDegrees, iFrameInterval)
+      return ChunkedRecordingManager(codec, outputDirectory, 0, iFrameInterval)
     }
   }
 
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt b/package/android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt
index c95c9b0..88b08f3 100644
--- a/package/android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt
@@ -21,7 +21,7 @@ class RecordingSession(
   private val enableAudio: Boolean,
   private val fps: Int? = null,
   private val hdr: Boolean = false,
-  private val orientation: Orientation,
+  private val cameraOrientation: Orientation,
   private val options: RecordVideoOptions,
   private val callback: (video: Video) -> Unit,
   private val onError: (error: CameraError) -> Unit
@@ -48,7 +48,7 @@ class RecordingSession(
     size,
     enableAudio,
     fps,
-    orientation,
+    cameraOrientation,
     bitRate,
     options,
     outputPath
@@ -124,7 +124,7 @@ class RecordingSession(
   override fun toString(): String {
     val audio = if (enableAudio) "with audio" else "without audio"
     return "${size.width} x ${size.height} @ $fps FPS ${options.videoCodec} ${options.fileType} " +
-      "$orientation ${bitRate / 1_000_000.0} Mbps RecordingSession ($audio)"
+      "$cameraOrientation ${bitRate / 1_000_000.0} Mbps RecordingSession ($audio)"
   }
 
   fun onFrame() {