Merge pull request 'pass filePath to RecordingSession' (#3) from loewy/store-video-internally-with-video-id into main

Reviewed-on: #3
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>

package/android/src/main/java/com/mrousavy/camera/CameraView+RecordVideo.kt

@@ -13,7 +13,7 @@ import com.mrousavy.camera.types.RecordVideoOptions
 import com.mrousavy.camera.utils.makeErrorMap
 import java.util.*
 
-suspend fun CameraView.startRecording(options: RecordVideoOptions, onRecordCallback: Callback) {
+suspend fun CameraView.startRecording(options: RecordVideoOptions, filePath: String, onRecordCallback: Callback) {
   // check audio permission
   if (audio == true) {
     if (ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
@@ -33,7 +33,7 @@ suspend fun CameraView.startRecording(options: RecordVideoOptions, onRecordCallb
     val errorMap = makeErrorMap(error.code, error.message)
     onRecordCallback(null, errorMap)
   }
-  cameraSession.startRecording(audio == true, options, callback, onError)
+  cameraSession.startRecording(audio == true, options, filePath, callback, onError)
 }
 
 @SuppressLint("RestrictedApi")

package/android/src/main/java/com/mrousavy/camera/CameraViewModule.kt

@@ -95,12 +95,12 @@ class CameraViewModule(reactContext: ReactApplicationContext) : ReactContextBase
 
   // TODO: startRecording() cannot be awaited, because I can't have a Promise and a onRecordedCallback in the same function. Hopefully TurboModules allows that
   @ReactMethod
-  fun startRecording(viewTag: Int, jsOptions: ReadableMap, onRecordCallback: Callback) {
+  fun startRecording(viewTag: Int, jsOptions: ReadableMap, filePath: String, onRecordCallback: Callback) {
     coroutineScope.launch {
       val view = findCameraView(viewTag)
       try {
         val options = RecordVideoOptions(jsOptions)
-        view.startRecording(options, onRecordCallback)
+        view.startRecording(options, filePath, onRecordCallback)
       } catch (error: CameraError) {
         val map = makeErrorMap("${error.domain}/${error.id}", error.message, error)
         onRecordCallback(null, map)

package/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt

@@ -621,6 +621,7 @@ class CameraSession(private val context: Context, private val cameraManager: Cam
   suspend fun startRecording(
     enableAudio: Boolean,
     options: RecordVideoOptions,
+    filePath: String,
     callback: (video: RecordingSession.Video) -> Unit,
     onError: (error: CameraError) -> Unit
   ) {
@@ -640,6 +641,7 @@ class CameraSession(private val context: Context, private val cameraManager: Cam
         videoOutput.enableHdr,
         orientation,
         options,
+        filePath,
         callback,
         onError,
         this.callback,

package/android/src/main/java/com/mrousavy/camera/core/ChunkedRecorder.kt

@@ -27,10 +27,11 @@ class ChunkedRecordingManager(private val encoder: MediaCodec, private val outpu
       bitRate: Int,
       options: RecordVideoOptions,
       outputDirectory: File,
-      iFrameInterval: Int = 3
+      iFrameInterval: Int = 5
     ): ChunkedRecordingManager {
       val mimeType = options.videoCodec.toMimeType()
-      val orientationDegrees = cameraOrientation.toDegrees()
+      val cameraOrientationDegrees = cameraOrientation.toDegrees()
+      val recordingOrientationDegrees = (options.orientation ?: Orientation.PORTRAIT).toDegrees();
       val (width, height) = if (cameraOrientation.isLandscape()) {
         size.height to size.width
       } else {
@@ -54,11 +55,13 @@ 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, orientation $cameraOrientation")
+      Log.d(TAG, "Video Format: $format, camera orientation $cameraOrientationDegrees, recordingOrientation: $recordingOrientationDegrees")
       // 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, 0, iFrameInterval, callbacks)
+      return ChunkedRecordingManager(
+        codec, outputDirectory, recordingOrientationDegrees, iFrameInterval, callbacks
+      )
     }
   }
 

package/android/src/main/java/com/mrousavy/camera/core/RecordingSession.kt

@@ -23,6 +23,7 @@ class RecordingSession(
   private val hdr: Boolean = false,
   private val cameraOrientation: Orientation,
   private val options: RecordVideoOptions,
+  private val filePath: String,
   private val callback: (video: Video) -> Unit,
   private val onError: (error: CameraError) -> Unit,
   private val allCallbacks: CameraSession.Callback,
@@ -37,12 +38,7 @@ class RecordingSession(
 
   data class Video(val path: String, val durationMs: Long, val size: Size)
 
-  private val outputPath = run {
+  private val outputPath: File = File(filePath)
-    val videoDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES)
-    val sdf = SimpleDateFormat("yyyy_MM_dd_HH_mm_ss_SSS", Locale.US)
-    val videoFileName = "VID_${sdf.format(Date())}"
-    File(videoDir!!, videoFileName)
-  }
 
   private val bitRate = getBitRate()
   private val recorder = ChunkedRecordingManager.fromParams(

package/android/src/main/java/com/mrousavy/camera/types/RecordVideoOptions.kt

@@ -8,6 +8,7 @@ class RecordVideoOptions(map: ReadableMap) {
   var videoCodec = VideoCodec.H264
   var videoBitRateOverride: Double? = null
   var videoBitRateMultiplier: Double? = null
+  var orientation: Orientation? = null
 
   init {
     if (map.hasKey("fileType")) {
@@ -25,5 +26,8 @@ class RecordVideoOptions(map: ReadableMap) {
     if (map.hasKey("videoBitRateMultiplier")) {
       videoBitRateMultiplier = map.getDouble("videoBitRateMultiplier")
     }
+    if (map.hasKey("orientation")) {
+      orientation = Orientation.fromUnionValue(map.getString("orientation"))
+    }
   }
 }

package/src/Camera.tsx

@@ -28,7 +28,7 @@ interface OnErrorEvent {
 }
 interface OnVideoChunkReadyEvent {
   filepath: string
-	index: int
+  index: number
 }
 type NativeCameraViewProps = Omit<CameraProps, 'device' | 'onInitialized' | 'onError' | 'frameProcessor' | 'codeScanner'> & {
   cameraId: string
@@ -173,7 +173,7 @@ export class Camera extends React.PureComponent<CameraProps, CameraState> {
    * }, 5000)
    * ```
    */
-	public startRecording(options: RecordVideoOptions): void {
+  public startRecording(options: RecordVideoOptions, filePath: string): void {
     const { onRecordingError, onRecordingFinished, videoBitRate, ...passThruOptions } = options
     if (typeof onRecordingError !== 'function' || typeof onRecordingFinished !== 'function')
       throw new CameraRuntimeError('parameter/invalid-parameter', 'The onRecordingError or onRecordingFinished functions were not set!')
@@ -207,7 +207,7 @@ export class Camera extends React.PureComponent<CameraProps, CameraState> {
     }
     try {
       // TODO: Use TurboModules to make this awaitable.
-			CameraModule.startRecording(this.handle, nativeOptions, onRecordCallback)
+      CameraModule.startRecording(this.handle, nativeOptions, filePath, onRecordCallback)
     } catch (e) {
       throw tryParseNativeCameraError(e)
     }