From 9ca6643748c0b39aa0d3e4fd4ebfb9c377adc0c8 Mon Sep 17 00:00:00 2001
From: Marc Rousavy <me@mrousavy.com>
Date: Wed, 26 Jun 2024 08:33:28 +0200
Subject: [PATCH] fix: Fix `ResolutionSelector.forSize` not respecting aspect
 ratio (#3026)

* fix: Fix `ResolutionSelector.forSize` not respecting aspect ratio

* fix: Also use that selector now for Preview
---
 .../camera/core/CameraConfiguration.kt        | 16 ---------------
 .../core/CameraSession+Configuration.kt       |  7 +++----
 .../ResolutionSelector+forAspectRatio.kt      | 20 -------------------
 .../extensions/ResolutionSelector+forSize.kt  |  6 ++++--
 .../core/extensions/Size+aspectRatio.kt       |  6 ++++++
 .../camera/core/extensions/Size+compareTo.kt  |  5 -----
 6 files changed, 13 insertions(+), 47 deletions(-)
 delete mode 100644 package/android/src/main/java/com/mrousavy/camera/core/extensions/ResolutionSelector+forAspectRatio.kt
 create mode 100644 package/android/src/main/java/com/mrousavy/camera/core/extensions/Size+aspectRatio.kt
 delete mode 100644 package/android/src/main/java/com/mrousavy/camera/core/extensions/Size+compareTo.kt

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
index 68158e077b..4a6d3f33cb 100644
--- a/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/core/CameraConfiguration.kt
@@ -51,22 +51,6 @@ data class CameraConfiguration(
   data class Audio(val nothing: Unit)
   data class Preview(val surfaceProvider: SurfaceProvider)
 
-  val targetPreviewAspectRatio: Float?
-    get() {
-      val format = format ?: return null
-      val video = video as? Output.Enabled<Video>
-      val photo = photo as? Output.Enabled<Photo>
-      return if (video != null) {
-        // Video capture is enabled, use video aspect ratio
-        format.videoWidth.toFloat() / format.videoHeight.toFloat()
-      } else if (photo != null) {
-        // Photo capture is enabled, use photo aspect ratio
-        format.photoWidth.toFloat() / format.photoHeight.toFloat()
-      } else {
-        null
-      }
-    }
-
   @Suppress("EqualsOrHashCode")
   sealed class Output<T> {
     val isEnabled: Boolean
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
index 2d4e3042dd..9f65e4536c 100644
--- 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
@@ -82,11 +82,10 @@ internal fun CameraSession.configureOutputs(configuration: CameraConfiguration)
         preview.setTargetFrameRate(fpsRange)
       }
 
-      val targetPreviewAspectRatio = configuration.targetPreviewAspectRatio
-      if (targetPreviewAspectRatio != null) {
-        Log.i(CameraSession.TAG, "Preview aspect ratio: $targetPreviewAspectRatio")
+      if (format != null) {
+        // Similar to iOS, Preview will follow video size as it's size (and aspect ratio)
         val previewResolutionSelector = ResolutionSelector.Builder()
-          .forAspectRatio(targetPreviewAspectRatio)
+          .forSize(format.videoSize)
           .setAllowedResolutionMode(ResolutionSelector.PREFER_CAPTURE_RATE_OVER_HIGHER_RESOLUTION)
           .build()
         preview.setResolutionSelector(previewResolutionSelector)
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/extensions/ResolutionSelector+forAspectRatio.kt b/package/android/src/main/java/com/mrousavy/camera/core/extensions/ResolutionSelector+forAspectRatio.kt
deleted file mode 100644
index ddeb654532..0000000000
--- a/package/android/src/main/java/com/mrousavy/camera/core/extensions/ResolutionSelector+forAspectRatio.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mrousavy.camera.core.extensions
-
-import androidx.camera.core.resolutionselector.ResolutionSelector
-import kotlin.math.abs
-
-/**
- * Gets a [ResolutionSelector] that finds a resolution closest to the given target aspect ratio.
- */
-fun ResolutionSelector.Builder.forAspectRatio(aspectRatio: Float): ResolutionSelector.Builder {
-  return this.setResolutionFilter { supportedSizes, _ ->
-    return@setResolutionFilter supportedSizes.sortedWith(
-      compareBy(
-        // Compare difference in aspect ratios first,
-        { abs(it.width.toFloat() / it.height - aspectRatio) },
-        // ..and total resolution afterwards.
-        { -(it.width * it.height) }
-      )
-    )
-  }
-}
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/extensions/ResolutionSelector+forSize.kt b/package/android/src/main/java/com/mrousavy/camera/core/extensions/ResolutionSelector+forSize.kt
index 671d789af1..5d29c679d1 100644
--- a/package/android/src/main/java/com/mrousavy/camera/core/extensions/ResolutionSelector+forSize.kt
+++ b/package/android/src/main/java/com/mrousavy/camera/core/extensions/ResolutionSelector+forSize.kt
@@ -4,15 +4,17 @@ import android.util.Size
 import androidx.camera.core.resolutionselector.ResolutionSelector
 import kotlin.math.abs
 
-private fun difference(left: Size, right: Size): Int = abs(left.width * left.height - right.width * right.height)
+private fun sizeDifference(left: Size, right: Size): Int = abs(left.width * left.height - right.width * right.height)
+private fun aspectRatioDifference(left: Size, right: Size): Float = abs(left.aspectRatio - right.aspectRatio)
 
 /**
  * Gets a [ResolutionSelector] that finds a resolution closest to the given target size.
  * There will always be a size available, but it is not guaranteed that it will be exactly the target size.
  * It is also possible that the resolved size is larger than the target size.
+ * The given target size's aspect ratio will have priority over sizes with a similar number of total pixels.
  */
 fun ResolutionSelector.Builder.forSize(size: Size): ResolutionSelector.Builder {
   return this.setResolutionFilter { supportedSizes, _ ->
-    return@setResolutionFilter supportedSizes.sortedBy { difference(it, size) }
+    return@setResolutionFilter supportedSizes.sortedWith(compareBy({ aspectRatioDifference(it, size) }, { sizeDifference(it, size) }))
   }
 }
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/extensions/Size+aspectRatio.kt b/package/android/src/main/java/com/mrousavy/camera/core/extensions/Size+aspectRatio.kt
new file mode 100644
index 0000000000..5dad03df66
--- /dev/null
+++ b/package/android/src/main/java/com/mrousavy/camera/core/extensions/Size+aspectRatio.kt
@@ -0,0 +1,6 @@
+package com.mrousavy.camera.core.extensions
+
+import android.util.Size
+
+val Size.aspectRatio: Float
+  get() = width.toFloat() / height.toFloat()
diff --git a/package/android/src/main/java/com/mrousavy/camera/core/extensions/Size+compareTo.kt b/package/android/src/main/java/com/mrousavy/camera/core/extensions/Size+compareTo.kt
deleted file mode 100644
index f938c035b2..0000000000
--- a/package/android/src/main/java/com/mrousavy/camera/core/extensions/Size+compareTo.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.mrousavy.camera.core.extensions
-
-import android.util.Size
-
-operator fun Size.compareTo(other: Size): Int = (this.width * this.height).compareTo(other.width * other.height)