feat: Adjust Preview resolution to comply with photo if video is …

…disabled (#3295) * docs: Update preview documentation and improve CameraSession configuration logic * refactor: put back the style * Update package/android/src/main/java/com/mrousavy/camera/core/CameraSession+Configuration.kt * put back the code style * Update docs/docs/guides/PREVIEW.mdx --------- Co-authored-by: Marc Rousavy <marcrousavy@hotmail.com>
mrousavy · Nov 20, 2024 · c7f5529 · c7f5529
1 parent 16d97d0
commit c7f5529
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/docs/docs/guides/PREVIEW.mdx b/docs/docs/guides/PREVIEW.mdx
@@ -62,7 +62,16 @@ const lowResolutionFormat = useCameraFormat(device, [
 ])
 ```
 
-On Android, the Preview will always be in full HD, or the Preview View's size, whichever is smaller.
+On Android, the Preview will always be in full HD or the Preview View's size, whichever is smaller.
+If a format is specified, the preview will try to match the `video`'s resolution and aspect ratio if `video` is enabled, and `photo`'s resolution and aspect ratio if `photo` is enabled.
+
+```tsx
+<Camera
+  {...props}
+  format={bestFormatForPhoto}
+  photo={true} // Preview will be in the photo resolution
+/>
+```
 
 ### Overlays and Masks
 
@@ -77,4 +86,4 @@ On Android, the Preview View supports two implementation modes which are control
 
 <br />
 
-#### 🚀 Next section: [Taking Photos](./taking-photos)
+#### 🚀 Next section: [Taking Photos](./taking-photos)
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
@@ -75,9 +75,11 @@ internal fun CameraSession.configureOutputs(configuration: CameraConfiguration)
       }
 
       if (format != null) {
-        // Similar to iOS, Preview will follow video size as it's size (and aspect ratio)
+        // Preview will follow video size as it's size & aspect ratio, or photo- if video is disabled.
+        val targetSize = if (videoConfig != null) format.videoSize else format.photoSize
+
         val previewResolutionSelector = ResolutionSelector.Builder()
-          .forSize(format.videoSize)
+          .forSize(targetSize)
           .setAllowedResolutionMode(ResolutionSelector.PREFER_CAPTURE_RATE_OVER_HIGHER_RESOLUTION)
           .build()
         preview.setResolutionSelector(previewResolutionSelector)