fix: Replace bitRateModifier -> bitRateMultiplier

mrousavy · Oct 30, 2024 · e97bb88 · e97bb88
1 parent 411fd58
commit e97bb88
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt b/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt
@@ -48,7 +48,7 @@ data class CameraConfiguration(
   // Output<T> types, those need to be comparable
   data class CodeScanner(val codeTypes: List<CodeType>)
   data class Photo(val isMirrored: Boolean, val enableHdr: Boolean, val photoQualityBalance: QualityBalance)
-  data class Video(val isMirrored: Boolean, val enableHdr: Boolean, val bitRateOverride: Double?, val bitRateModifier: Double?)
+  data class Video(val isMirrored: Boolean, val enableHdr: Boolean, val bitRateOverride: Double?, val bitRateMultiplier: Double?)
   data class FrameProcessor(val isMirrored: Boolean, val pixelFormat: PixelFormat)
   data class Audio(val nothing: Unit)
   data class Preview(val surfaceProvider: SurfaceProvider)

diff --git a/package/android/src/main/java/com/mrousavy/camera/core/CameraSession+Configuration.kt b/package/android/src/main/java/com/mrousavy/camera/core/CameraSession+Configuration.kt
@@ -127,9 +127,9 @@ internal fun CameraSession.configureOutputs(configuration: CameraConfiguration)
           val bps = bitRateOverride * 1_000_000
           recorder.setTargetVideoEncodingBitRate(bps.toInt())
         }
-        videoConfig.config.bitRateModifier?.let { bitRateModifier ->
+        videoConfig.config.bitRateMultiplier?.let { bitRateMultiplier ->
           val currentBitRate = recorder.build().targetVideoEncodingBitRate
-          val targetBitRate = currentBitRate.toDouble() * bitRateModifier
+          val targetBitRate = currentBitRate.toDouble() * bitRateMultiplier
           val bps = targetBitRate * 1_000_000
           recorder.setTargetVideoEncodingBitRate(bps.toInt())
         }

diff --git a/package/android/src/main/java/com/mrousavy/camera/react/CameraView.kt b/package/android/src/main/java/com/mrousavy/camera/react/CameraView.kt
@@ -76,7 +76,7 @@ class CameraView(context: Context) :
   var videoHdr = false
   var photoHdr = false
   var videoBitRateOverride: Double? = null
-  var videoBitRateModifier: Double? = null
+  var videoBitRateMultiplier: Double? = null
 
   // TODO: Use .BALANCED once CameraX fixes it https://issuetracker.google.com/issues/337214687
   var photoQualityBalance = QualityBalance.SPEED
@@ -184,7 +184,7 @@ class CameraView(context: Context) :
         if (video || enableFrameProcessor) {
           config.video =
             CameraConfiguration.Output.Enabled.create(
-              CameraConfiguration.Video(isMirrored, videoHdr, videoBitRateOverride, videoBitRateModifier)
+              CameraConfiguration.Video(isMirrored, videoHdr, videoBitRateOverride, videoBitRateMultiplier)
             )
         } else {
           config.video = CameraConfiguration.Output.Disabled.create()

diff --git a/package/android/src/main/java/com/mrousavy/camera/react/CameraViewManager.kt b/package/android/src/main/java/com/mrousavy/camera/react/CameraViewManager.kt
@@ -200,12 +200,12 @@ class CameraViewManager : ViewGroupManager<CameraView>() {
     }
   }
 
-  @ReactProp(name = "videoBitRateModifier", defaultDouble = -1.0)
-  fun setVideoBitRateModifier(view: CameraView, videoBitRateModifier: Double) {
-    if (videoBitRateModifier != -1.0) {
-      view.videoBitRateModifier = videoBitRateModifier
+  @ReactProp(name = "videoBitRateMultiplier", defaultDouble = -1.0)
+  fun setVideoBitRateMultiplier(view: CameraView, videoBitRateMultiplier: Double) {
+    if (videoBitRateMultiplier != -1.0) {
+      view.videoBitRateMultiplier = videoBitRateMultiplier
     } else {
-      view.videoBitRateModifier = null
+      view.videoBitRateMultiplier = null
     }
   }
 

diff --git a/package/ios/Core/Types/RecordVideoOptions.swift b/package/ios/Core/Types/RecordVideoOptions.swift
@@ -24,7 +24,7 @@ struct RecordVideoOptions {
    */
   var bitRateMultiplier: Double?
 
-  init(fromJSValue dictionary: NSDictionary, bitRateOverride: Double? = nil, bitRateModifier: Double? = nil) throws {
+  init(fromJSValue dictionary: NSDictionary, bitRateOverride: Double? = nil, bitRateMultiplier: Double? = nil) throws {
     // File Type (.mov or .mp4)
     if let fileTypeOption = dictionary["fileType"] as? String {
       fileType = try AVFileType(withString: fileTypeOption)
@@ -40,7 +40,7 @@ struct RecordVideoOptions {
     // BitRate Override
     self.bitRateOverride = bitRateOverride
     // BitRate Multiplier
-    self.bitRateModifier = bitRateModifier
+    self.bitRateMultiplier = bitRateMultiplier
     // Custom Path
     let fileExtension = fileType.descriptor ?? "mov"
     if let customPath = dictionary["path"] as? String {

diff --git a/package/ios/React/CameraView+RecordVideo.swift b/package/ios/React/CameraView+RecordVideo.swift
@@ -18,7 +18,7 @@ extension CameraView: AVCaptureVideoDataOutputSampleBufferDelegate, AVCaptureAud
     do {
       let options = try RecordVideoOptions(fromJSValue: options,
                                            bitRateOverride: videoBitRateOverride,
-                                           videoBitRateModifier: videoBitRateModifier)
+                                           videoBitRateMultiplier: videoBitRateMultiplier)
 
       // Start Recording with success and error callbacks
       cameraSession.startRecording(

diff --git a/package/ios/React/CameraView.swift b/package/ios/React/CameraView.swift
@@ -54,7 +54,7 @@ public final class CameraView: UIView, CameraSessionDelegate, PreviewViewDelegat
   @objc var lowLightBoost = false
   @objc var outputOrientation: NSString?
   @objc var videoBitRateOverride: NSNumber?
-  @objc var videoBitRateModifier: NSNumber?
+  @objc var videoBitRateMultiplier: NSNumber?
 
   // other props
   @objc var isActive = false
@@ -213,7 +213,7 @@ public final class CameraView: UIView, CameraSessionDelegate, PreviewViewDelegat
                                                                   enableHdr: videoHdr,
                                                                   enableFrameProcessor: enableFrameProcessor,
                                                                   bitRateOverride: videoBitRateOverride,
-                                                                  bitRateModifier: videoBitRateModifier))
+                                                                  bitRateMultiplier: videoBitRateMultiplier))
       } else {
         config.video = .disabled
       }

diff --git a/package/ios/React/CameraViewManager.m b/package/ios/React/CameraViewManager.m
@@ -48,7 +48,7 @@ @interface RCT_EXTERN_REMAP_MODULE (CameraView, CameraViewManager, RCTViewManage
 RCT_EXPORT_VIEW_PROPERTY(videoStabilizationMode, NSString);
 RCT_EXPORT_VIEW_PROPERTY(pixelFormat, NSString);
 RCT_EXPORT_VIEW_PROPERTY(videoBitRateOverride, NSNumber);
-RCT_EXPORT_VIEW_PROPERTY(videoBitRateModifier, NSNumber);
+RCT_EXPORT_VIEW_PROPERTY(videoBitRateMultiplier, NSNumber);
 // other props
 RCT_EXPORT_VIEW_PROPERTY(torch, NSString);
 RCT_EXPORT_VIEW_PROPERTY(zoom, NSNumber);