diff --git a/.github/workflows/build/action.yml b/.github/workflows/build/action.yml
index 444a6a05..5b994275 100644
--- a/.github/workflows/build/action.yml
+++ b/.github/workflows/build/action.yml
@@ -9,6 +9,7 @@ runs:
       with:
         distribution: 'zulu'
         java-version: 17
+        cache: 'gradle'
 
     - name: Build with Gradle
       shell: bash
diff --git a/.github/workflows/gerrit.yml b/.github/workflows/gerrit.yml
index 6589c3be..4a6c4491 100644
--- a/.github/workflows/gerrit.yml
+++ b/.github/workflows/gerrit.yml
@@ -21,3 +21,10 @@ jobs:
 
     - name: Build
       uses: ./.github/workflows/build
+
+    - uses: lineageos-infra/gerrit-vote@main
+      if: always()
+      with:
+        auth: ${{ secrets.GERRIT_VOTE_CREDS }}
+        change: ${{ inputs.change }}
+        ref: ${{ inputs.ref }}
diff --git a/LICENSES/CC-PDDC.txt b/LICENSES/CC-PDDC.txt
new file mode 100644
index 00000000..b64dfd6b
--- /dev/null
+++ b/LICENSES/CC-PDDC.txt
@@ -0,0 +1,8 @@
+
+The person or persons who have associated work with this document (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of his knowledge, the work of authorship identified is in the public domain of the country from which the work is published, or (b) hereby dedicates whatever copyright the dedicators holds in the work of authorship identified below (the "Work") to the public domain. A certifier, moreover, dedicates any copyright interest he may have in the associated work, and for these purposes, is described as a "dedicator" below.
+
+A certifier has taken reasonable steps to verify the copyright status of this work. Certifier recognizes that his good faith efforts may not shield him from liability if in fact the work certified is not in the public domain.
+
+Dedicator makes this dedication for the benefit of the public at large and to the detriment of the Dedicator's heirs and successors. Dedicator intends this dedication to be an overt act of relinquishment in perpetuity of all present and future rights under copyright law, whether vested or contingent, in the Work. Dedicator understands that such relinquishment of all rights includes the relinquishment of all rights to enforce (by lawsuit or otherwise) those copyrights in the Work.
+
+Dedicator recognizes that, once placed in the public domain, the Work may be freely reproduced, distributed, transmitted, used, modified, built upon, or otherwise exploited by anyone for any purpose, commercial or non-commercial, and in any way, including by methods that have not yet been invented or conceived.
diff --git a/app/Android.bp b/app/Android.bp
index 090178d2..cc83f225 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -16,7 +16,7 @@ android_app {
     resource_dirs: ["src/main/res"],
     manifest: "src/main/AndroidManifest.xml",
 
-    sdk_version: "current",
+    sdk_version: "33",
     product_specific: true,
     overrides: ["Camera2"],
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bb887e2d..6c9b2d8b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -18,7 +18,7 @@ apply {
 
 buildscript {
     repositories {
-        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.1/.m2")
+        maven("https://raw.githubusercontent.com/lineage-next/gradle-generatebp/v1.4/.m2")
     }
 
     dependencies {
@@ -28,6 +28,7 @@ buildscript {
 
 android {
     compileSdk = 33
+    namespace = "org.lineageos.aperture"
 
     defaultConfig {
         applicationId = "org.lineageos.aperture"
@@ -83,7 +84,7 @@ dependencies {
     implementation("com.google.android.material:material:1.9.0")
 
     // CameraX core library using the camera2 implementation
-    val cameraxVersion = "1.4.0-alpha01"
+    val cameraxVersion = "1.4.0-alpha02"
     // The following line is optional, as the core library is included indirectly by camera-camera2
     implementation("androidx.camera:camera-core:${cameraxVersion}")
     implementation("androidx.camera:camera-camera2:${cameraxVersion}")
@@ -123,6 +124,7 @@ configure<GenerateBpPluginExtension> {
             }
             module.group.startsWith("org.jetbrains") -> true
             module.group == "com.google.auto.value" -> true
+            module.group == "com.google.errorprone" -> true
             module.group == "com.google.guava" -> true
             module.group == "junit" -> true
             else -> false
diff --git a/app/libs/Android.bp b/app/libs/Android.bp
index 7d280663..9603f438 100644
--- a/app/libs/Android.bp
+++ b/app/libs/Android.bp
@@ -7,7 +7,7 @@
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-camera2-nodeps",
-    aars: ["androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-camera2/1.4.0-alpha02/camera-camera2-1.4.0-alpha02.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -31,7 +31,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-camera2/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-camera2-nodeps",
         "Aperture_androidx.camera_camera-core",
@@ -45,7 +45,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-core-nodeps",
-    aars: ["androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-core/1.4.0-alpha02/camera-core-1.4.0-alpha02.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -73,7 +73,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-core/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-core-nodeps",
         "androidx.annotation_annotation-experimental",
@@ -91,7 +91,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-extensions-nodeps",
-    aars: ["androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-extensions/1.4.0-alpha02/camera-extensions-1.4.0-alpha02.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -116,7 +116,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-extensions/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-extensions-nodeps",
         "Aperture_androidx.camera_camera-camera2",
@@ -131,7 +131,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-lifecycle-nodeps",
-    aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-lifecycle/1.4.0-alpha02/camera-lifecycle-1.4.0-alpha02.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -156,7 +156,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-lifecycle/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-lifecycle-nodeps",
         "Aperture_androidx.camera_camera-core",
@@ -171,7 +171,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-video-nodeps",
-    aars: ["androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-video/1.4.0-alpha02/camera-video-1.4.0-alpha02.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -194,7 +194,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-video/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-video-nodeps",
         "Aperture_androidx.camera_camera-core",
@@ -207,7 +207,7 @@ android_library {
 
 android_library_import {
     name: "Aperture_androidx.camera_camera-view-nodeps",
-    aars: ["androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar"],
+    aars: ["androidx/camera/camera-view/1.4.0-alpha02/camera-view-1.4.0-alpha02.aar"],
     sdk_version: "33",
     min_sdk_version: "14",
     apex_available: [
@@ -236,7 +236,7 @@ android_library {
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    manifest: "androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml",
+    manifest: "androidx/camera/camera-view/1.4.0-alpha02/AndroidManifest.xml",
     static_libs: [
         "Aperture_androidx.camera_camera-view-nodeps",
         "androidx.annotation_annotation-experimental",
@@ -568,7 +568,7 @@ android_library_import {
         "androidx.transition_transition",
         "androidx.vectordrawable_vectordrawable",
         "androidx.viewpager2_viewpager2",
-        "Aperture_com.google.errorprone_error_prone_annotations",
+        "error_prone_annotations",
     ],
 }
 
@@ -597,32 +597,7 @@ android_library {
         "androidx.transition_transition",
         "androidx.vectordrawable_vectordrawable",
         "androidx.viewpager2_viewpager2",
-        "Aperture_com.google.errorprone_error_prone_annotations",
-    ],
-    java_version: "1.7",
-}
-
-java_import {
-    name: "Aperture_com.google.errorprone_error_prone_annotations-nodeps",
-    jars: ["com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar"],
-    sdk_version: "33",
-    min_sdk_version: "14",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-}
-
-java_library_static {
-    name: "Aperture_com.google.errorprone_error_prone_annotations",
-    sdk_version: "33",
-    min_sdk_version: "14",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "Aperture_com.google.errorprone_error_prone_annotations-nodeps",
+        "error_prone_annotations",
     ],
     java_version: "1.7",
 }
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar
deleted file mode 100644
index c1b26c79..00000000
Binary files a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar and /dev/null differ
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha02/camera-camera2-1.4.0-alpha02.aar b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha02/camera-camera2-1.4.0-alpha02.aar
new file mode 100644
index 00000000..056d56d8
Binary files /dev/null and b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha02/camera-camera2-1.4.0-alpha02.aar differ
diff --git a/app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar.license b/app/libs/androidx/camera/camera-camera2/1.4.0-alpha02/camera-camera2-1.4.0-alpha02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-camera2/1.4.0-alpha01/camera-camera2-1.4.0-alpha01.aar.license
rename to app/libs/androidx/camera/camera-camera2/1.4.0-alpha02/camera-camera2-1.4.0-alpha02.aar.license
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar
deleted file mode 100644
index 6f6c3166..00000000
Binary files a/app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar and /dev/null differ
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml b/app/libs/androidx/camera/camera-core/1.4.0-alpha02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-core/1.4.0-alpha02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-core/1.4.0-alpha02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-core/1.4.0-alpha01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-core/1.4.0-alpha02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha02/camera-core-1.4.0-alpha02.aar b/app/libs/androidx/camera/camera-core/1.4.0-alpha02/camera-core-1.4.0-alpha02.aar
new file mode 100644
index 00000000..4dde8467
Binary files /dev/null and b/app/libs/androidx/camera/camera-core/1.4.0-alpha02/camera-core-1.4.0-alpha02.aar differ
diff --git a/app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar.license b/app/libs/androidx/camera/camera-core/1.4.0-alpha02/camera-core-1.4.0-alpha02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-core/1.4.0-alpha01/camera-core-1.4.0-alpha01.aar.license
rename to app/libs/androidx/camera/camera-core/1.4.0-alpha02/camera-core-1.4.0-alpha02.aar.license
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar
deleted file mode 100644
index 2ca12d1c..00000000
Binary files a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar and /dev/null differ
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha02/camera-extensions-1.4.0-alpha02.aar b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha02/camera-extensions-1.4.0-alpha02.aar
new file mode 100644
index 00000000..0783ee15
Binary files /dev/null and b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha02/camera-extensions-1.4.0-alpha02.aar differ
diff --git a/app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar.license b/app/libs/androidx/camera/camera-extensions/1.4.0-alpha02/camera-extensions-1.4.0-alpha02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-extensions/1.4.0-alpha01/camera-extensions-1.4.0-alpha01.aar.license
rename to app/libs/androidx/camera/camera-extensions/1.4.0-alpha02/camera-extensions-1.4.0-alpha02.aar.license
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar
deleted file mode 100644
index 59833bb7..00000000
Binary files a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar and /dev/null differ
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha02/camera-lifecycle-1.4.0-alpha02.aar b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha02/camera-lifecycle-1.4.0-alpha02.aar
new file mode 100644
index 00000000..d6716907
Binary files /dev/null and b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha02/camera-lifecycle-1.4.0-alpha02.aar differ
diff --git a/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar.license b/app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha02/camera-lifecycle-1.4.0-alpha02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha01/camera-lifecycle-1.4.0-alpha01.aar.license
rename to app/libs/androidx/camera/camera-lifecycle/1.4.0-alpha02/camera-lifecycle-1.4.0-alpha02.aar.license
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar
deleted file mode 100644
index fa2db859..00000000
Binary files a/app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar and /dev/null differ
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml b/app/libs/androidx/camera/camera-video/1.4.0-alpha02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-video/1.4.0-alpha02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-video/1.4.0-alpha02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-video/1.4.0-alpha01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-video/1.4.0-alpha02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha02/camera-video-1.4.0-alpha02.aar b/app/libs/androidx/camera/camera-video/1.4.0-alpha02/camera-video-1.4.0-alpha02.aar
new file mode 100644
index 00000000..d7fcc196
Binary files /dev/null and b/app/libs/androidx/camera/camera-video/1.4.0-alpha02/camera-video-1.4.0-alpha02.aar differ
diff --git a/app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar.license b/app/libs/androidx/camera/camera-video/1.4.0-alpha02/camera-video-1.4.0-alpha02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-video/1.4.0-alpha01/camera-video-1.4.0-alpha01.aar.license
rename to app/libs/androidx/camera/camera-video/1.4.0-alpha02/camera-video-1.4.0-alpha02.aar.license
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar b/app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar
deleted file mode 100644
index ee275893..00000000
Binary files a/app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar and /dev/null differ
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml b/app/libs/androidx/camera/camera-view/1.4.0-alpha02/AndroidManifest.xml
similarity index 100%
rename from app/libs/androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml
rename to app/libs/androidx/camera/camera-view/1.4.0-alpha02/AndroidManifest.xml
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml.license b/app/libs/androidx/camera/camera-view/1.4.0-alpha02/AndroidManifest.xml.license
similarity index 100%
rename from app/libs/androidx/camera/camera-view/1.4.0-alpha01/AndroidManifest.xml.license
rename to app/libs/androidx/camera/camera-view/1.4.0-alpha02/AndroidManifest.xml.license
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha02/camera-view-1.4.0-alpha02.aar b/app/libs/androidx/camera/camera-view/1.4.0-alpha02/camera-view-1.4.0-alpha02.aar
new file mode 100644
index 00000000..0cdbc7c7
Binary files /dev/null and b/app/libs/androidx/camera/camera-view/1.4.0-alpha02/camera-view-1.4.0-alpha02.aar differ
diff --git a/app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar.license b/app/libs/androidx/camera/camera-view/1.4.0-alpha02/camera-view-1.4.0-alpha02.aar.license
similarity index 100%
rename from app/libs/androidx/camera/camera-view/1.4.0-alpha01/camera-view-1.4.0-alpha01.aar.license
rename to app/libs/androidx/camera/camera-view/1.4.0-alpha02/camera-view-1.4.0-alpha02.aar.license
diff --git a/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar b/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar
deleted file mode 100644
index ff3b59a0..00000000
Binary files a/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar and /dev/null differ
diff --git a/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar.license b/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar.license
deleted file mode 100644
index c6127c56..00000000
--- a/app/libs/com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2023 Google LLC
-
-SPDX-License-Identifier: Apache-2.0
diff --git a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
index 5032c0ed..894484d9 100644
--- a/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/CameraActivity.kt
@@ -52,6 +52,7 @@ import androidx.camera.camera2.interop.CaptureRequestOptions
 import androidx.camera.core.AspectRatio
 import androidx.camera.core.ImageCapture
 import androidx.camera.core.ImageCaptureException
+import androidx.camera.core.MirrorMode
 import androidx.camera.core.resolutionselector.AspectRatioStrategy
 import androidx.camera.core.resolutionselector.ResolutionSelector
 import androidx.camera.extensions.ExtensionMode
@@ -90,21 +91,30 @@ import coil.request.SuccessResult
 import coil.size.Scale
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.sync.Mutex
-import org.lineageos.aperture.camera.CameraFacing
 import org.lineageos.aperture.camera.CameraManager
-import org.lineageos.aperture.camera.CameraMode
-import org.lineageos.aperture.camera.CameraState
 import org.lineageos.aperture.camera.CameraViewModel
-import org.lineageos.aperture.camera.ColorCorrectionAberrationMode
-import org.lineageos.aperture.camera.DistortionCorrectionMode
-import org.lineageos.aperture.camera.EdgeMode
-import org.lineageos.aperture.camera.FlashMode
-import org.lineageos.aperture.camera.FrameRate
-import org.lineageos.aperture.camera.HotPixelMode
-import org.lineageos.aperture.camera.NoiseReductionMode
-import org.lineageos.aperture.camera.ShadingMode
-import org.lineageos.aperture.camera.VideoStabilizationMode
 import org.lineageos.aperture.ext.*
+import org.lineageos.aperture.models.AssistantIntent
+import org.lineageos.aperture.models.CameraFacing
+import org.lineageos.aperture.models.CameraMode
+import org.lineageos.aperture.models.CameraState
+import org.lineageos.aperture.models.ColorCorrectionAberrationMode
+import org.lineageos.aperture.models.DistortionCorrectionMode
+import org.lineageos.aperture.models.EdgeMode
+import org.lineageos.aperture.models.FlashMode
+import org.lineageos.aperture.models.FrameRate
+import org.lineageos.aperture.models.GestureActions
+import org.lineageos.aperture.models.GridMode
+import org.lineageos.aperture.models.HotPixelMode
+import org.lineageos.aperture.models.MediaType
+import org.lineageos.aperture.models.NoiseReductionMode
+import org.lineageos.aperture.models.Rotation
+import org.lineageos.aperture.models.ShadingMode
+import org.lineageos.aperture.models.TimerMode
+import org.lineageos.aperture.models.VideoDynamicRange
+import org.lineageos.aperture.models.VideoMirrorMode
+import org.lineageos.aperture.models.VideoQualityInfo
+import org.lineageos.aperture.models.VideoStabilizationMode
 import org.lineageos.aperture.qr.QrImageAnalyzer
 import org.lineageos.aperture.ui.CameraModeSelectorLayout
 import org.lineageos.aperture.ui.CapturePreviewLayout
@@ -117,20 +127,14 @@ import org.lineageos.aperture.ui.LevelerView
 import org.lineageos.aperture.ui.LocationPermissionsDialog
 import org.lineageos.aperture.ui.PreviewBlurView
 import org.lineageos.aperture.ui.VerticalSlider
-import org.lineageos.aperture.utils.AssistantIntent
 import org.lineageos.aperture.utils.BroadcastUtils
 import org.lineageos.aperture.utils.CameraSoundsUtils
 import org.lineageos.aperture.utils.ExifUtils
-import org.lineageos.aperture.utils.GestureActions
 import org.lineageos.aperture.utils.GoogleLensUtils
-import org.lineageos.aperture.utils.GridMode
 import org.lineageos.aperture.utils.MediaStoreUtils
-import org.lineageos.aperture.utils.MediaType
 import org.lineageos.aperture.utils.PermissionsUtils
-import org.lineageos.aperture.utils.Rotation
 import org.lineageos.aperture.utils.ShortcutsUtils
 import org.lineageos.aperture.utils.StorageUtils
-import org.lineageos.aperture.utils.TimerMode
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.FileNotFoundException
@@ -173,6 +177,7 @@ open class CameraActivity : AppCompatActivity() {
     private val videoFrameRateButton by lazy { findViewById<Button>(R.id.videoFrameRateButton) }
     private val videoQualityButton by lazy { findViewById<Button>(R.id.videoQualityButton) }
     private val videoRecordingStateButton by lazy { findViewById<ImageButton>(R.id.videoRecordingStateButton) }
+    private val videoDynamicRangeButton by lazy { findViewById<Button>(R.id.videoDynamicRangeButton) }
     private val viewFinder by lazy { findViewById<PreviewView>(R.id.viewFinder) }
     private val viewFinderFocus by lazy { findViewById<ImageView>(R.id.viewFinderFocus) }
     private val zoomLevel by lazy { findViewById<HorizontalSlider>(R.id.zoomLevel) }
@@ -211,6 +216,7 @@ open class CameraActivity : AppCompatActivity() {
     private var photoEffect by nonNullablePropertyDelegate { model.photoEffect }
     private var videoQuality by nonNullablePropertyDelegate { model.videoQuality }
     private var videoFrameRate by nullablePropertyDelegate { model.videoFrameRate }
+    private var videoDynamicRange by nonNullablePropertyDelegate { model.videoDynamicRange }
     private var videoMicMode by nonNullablePropertyDelegate { model.videoMicMode }
     private var videoRecording by nullablePropertyDelegate { model.videoRecording }
     private var videoDuration by nonNullablePropertyDelegate { model.videoRecordingDuration }
@@ -228,10 +234,12 @@ open class CameraActivity : AppCompatActivity() {
     // Video
     private val supportedVideoQualities: Set<Quality>
         get() = camera.supportedVideoQualities.keys
+    private val videoQualityInfo: VideoQualityInfo?
+        get() = camera.supportedVideoQualities[videoQuality]
     private val supportedVideoFrameRates: Set<FrameRate>
-        get() = camera.supportedVideoQualities.getOrDefault(
-            videoQuality, setOf()
-        )
+        get() = videoQualityInfo?.supportedFrameRates ?: setOf()
+    private val supportedVideoDynamicRanges: Set<VideoDynamicRange>
+        get() = videoQualityInfo?.supportedDynamicRanges ?: setOf()
     private lateinit var videoAudioConfig: AudioConfig
 
     // QR
@@ -573,6 +581,7 @@ open class CameraActivity : AppCompatActivity() {
         photoEffect = sharedPreferences.photoEffect
         videoQuality = sharedPreferences.videoQuality
         videoFrameRate = sharedPreferences.videoFrameRate
+        videoDynamicRange = sharedPreferences.videoDynamicRange
         videoMicMode = sharedPreferences.lastMicMode
 
         // Handle intent
@@ -627,6 +636,7 @@ open class CameraActivity : AppCompatActivity() {
         aspectRatioButton.setOnClickListener { cycleAspectRatio() }
         videoQualityButton.setOnClickListener { cycleVideoQuality() }
         videoFrameRateButton.setOnClickListener { cycleVideoFrameRate() }
+        videoDynamicRangeButton.setOnClickListener { cycleVideoDynamicRange() }
         effectButton.setOnClickListener { cyclePhotoEffects() }
         gridButton.setOnClickListener { cycleGridMode() }
         timerButton.setOnClickListener { toggleTimerMode() }
@@ -868,6 +878,7 @@ open class CameraActivity : AppCompatActivity() {
             aspectRatioButton.isVisible = cameraMode != CameraMode.VIDEO
             videoQualityButton.isVisible = cameraMode == CameraMode.VIDEO
             videoFrameRateButton.isVisible = cameraMode == CameraMode.VIDEO
+            videoDynamicRangeButton.isVisible = cameraMode == CameraMode.VIDEO
             micButton.isVisible = cameraMode == CameraMode.VIDEO
 
             updateSecondaryTopBarButtons()
@@ -1086,6 +1097,16 @@ open class CameraActivity : AppCompatActivity() {
             } ?: resources.getString(R.string.video_framerate_auto)
         }
 
+        model.videoDynamicRange.observe(this) {
+            val videoDynamicRange = it
+
+            // Update secondary bar buttons
+            videoDynamicRangeButton.setCompoundDrawablesWithIntrinsicBounds(
+                0, videoDynamicRange.icon, 0, 0
+            )
+            videoDynamicRangeButton.setText(videoDynamicRange.title)
+        }
+
         // Observe video mic mode
         model.videoMicMode.observe(this) {
             val videoMicMode = it ?: return@observe
@@ -1536,6 +1557,22 @@ open class CameraActivity : AppCompatActivity() {
                     videoFrameRate ?: FrameRate.FPS_30, supportedVideoFrameRates
                 )
 
+                // Set video dynamic range
+                videoDynamicRange = videoDynamicRange.takeIf {
+                    supportedVideoDynamicRanges.contains(it)
+                } ?: supportedVideoDynamicRanges.first()
+                cameraController.videoCaptureDynamicRange = videoDynamicRange.dynamicRange
+
+                // Set video mirror mode
+                cameraController.videoCaptureMirrorMode = when (sharedPreferences.videoMirrorMode) {
+                    VideoMirrorMode.OFF -> MirrorMode.MIRROR_MODE_OFF
+                    VideoMirrorMode.ON -> MirrorMode.MIRROR_MODE_ON
+                    VideoMirrorMode.ON_FFC_ONLY -> when (camera.cameraFacing) {
+                        CameraFacing.FRONT -> MirrorMode.MIRROR_MODE_ON
+                        else -> MirrorMode.MIRROR_MODE_OFF
+                    }
+                }
+
                 CameraController.VIDEO_CAPTURE
             }
         }
@@ -1862,9 +1899,9 @@ open class CameraActivity : AppCompatActivity() {
             val videoRecording = model.videoRecording.value
 
             val supportedVideoQualities = camera.supportedVideoQualities
-            val supportedVideoFrameRates = supportedVideoQualities.getOrDefault(
-                videoQuality, setOf()
-            )
+            val videoQualityInfo = supportedVideoQualities[videoQuality]
+            val supportedVideoFrameRates = videoQualityInfo?.supportedFrameRates ?: setOf()
+            val supportedVideoDynamicRanges = videoQualityInfo?.supportedDynamicRanges ?: setOf()
 
             flashButton.isEnabled =
                 cameraMode != CameraMode.PHOTO || cameraState == CameraState.IDLE
@@ -1875,6 +1912,8 @@ open class CameraActivity : AppCompatActivity() {
                 cameraState == CameraState.IDLE && supportedVideoQualities.size > 1
             videoFrameRateButton.isEnabled =
                 cameraState == CameraState.IDLE && supportedVideoFrameRates.size > 1
+            videoDynamicRangeButton.isEnabled =
+                cameraState == CameraState.IDLE && supportedVideoDynamicRanges.size > 1
             micButton.isEnabled =
                 cameraState == CameraState.IDLE || videoRecording?.isAudioSourceConfigured == true
         }
@@ -1953,6 +1992,26 @@ open class CameraActivity : AppCompatActivity() {
         bindCameraUseCases()
     }
 
+    private fun cycleVideoDynamicRange() {
+        if (!canRestartCamera()) {
+            return
+        }
+
+        val currentVideoDynamicRange = videoDynamicRange
+        val newVideoDynamicRange =
+            supportedVideoDynamicRanges.toList().sorted().next(currentVideoDynamicRange)
+
+        if (newVideoDynamicRange == currentVideoDynamicRange) {
+            return
+        }
+
+        videoDynamicRange = newVideoDynamicRange
+
+        sharedPreferences.videoDynamicRange = videoDynamicRange
+
+        bindCameraUseCases()
+    }
+
     /**
      * Set the specified grid mode, also updating the icon
      */
@@ -2424,8 +2483,6 @@ open class CameraActivity : AppCompatActivity() {
         finish()
     }
 
-    fun preventClicks(@Suppress("UNUSED_PARAMETER") view: View) {}
-
     companion object {
         private const val LOG_TAG = "Aperture"
 
diff --git a/app/src/main/java/org/lineageos/aperture/QrScannerActivity.kt b/app/src/main/java/org/lineageos/aperture/QrScannerActivity.kt
index 0c402fea..0059dc63 100644
--- a/app/src/main/java/org/lineageos/aperture/QrScannerActivity.kt
+++ b/app/src/main/java/org/lineageos/aperture/QrScannerActivity.kt
@@ -5,7 +5,7 @@
 
 package org.lineageos.aperture
 
-import org.lineageos.aperture.camera.CameraMode
+import org.lineageos.aperture.models.CameraMode
 
 @androidx.camera.camera2.interop.ExperimentalCamera2Interop
 @androidx.camera.core.ExperimentalZeroShutterLag
diff --git a/app/src/main/java/org/lineageos/aperture/camera/Camera.kt b/app/src/main/java/org/lineageos/aperture/camera/Camera.kt
index 0a9cb887..f8cad35e 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/Camera.kt
+++ b/app/src/main/java/org/lineageos/aperture/camera/Camera.kt
@@ -11,9 +11,20 @@ import android.os.Build
 import androidx.camera.camera2.interop.Camera2CameraInfo
 import androidx.camera.core.CameraInfo
 import androidx.camera.core.CameraSelector
-import androidx.camera.core.DynamicRange
 import androidx.camera.video.Recorder
 import org.lineageos.aperture.ext.*
+import org.lineageos.aperture.models.CameraFacing
+import org.lineageos.aperture.models.CameraMode
+import org.lineageos.aperture.models.ColorCorrectionAberrationMode
+import org.lineageos.aperture.models.DistortionCorrectionMode
+import org.lineageos.aperture.models.EdgeMode
+import org.lineageos.aperture.models.FrameRate
+import org.lineageos.aperture.models.HotPixelMode
+import org.lineageos.aperture.models.NoiseReductionMode
+import org.lineageos.aperture.models.ShadingMode
+import org.lineageos.aperture.models.VideoDynamicRange
+import org.lineageos.aperture.models.VideoQualityInfo
+import org.lineageos.aperture.models.VideoStabilizationMode
 import kotlin.reflect.safeCast
 
 /**
@@ -49,11 +60,38 @@ class Camera(cameraInfo: CameraInfo, cameraManager: CameraManager) {
     private val supportedVideoFrameRates = cameraInfo.supportedFrameRateRanges.mapNotNull {
         FrameRate.fromRange(it)
     }.toSet()
+
+    private val videoCapabilities = Recorder.getVideoCapabilities(cameraInfo)
+
+    private val supportedVideoDynamicRanges = videoCapabilities.supportedDynamicRanges.map {
+        VideoDynamicRange.fromDynamicRange(it)
+    }
+
+    private val videoQualityForDynamicRanges = supportedVideoDynamicRanges.associateWith {
+        videoCapabilities.getSupportedQualities(it.dynamicRange)
+    }
+
     val supportedVideoQualities =
-        Recorder.getVideoCapabilities(cameraInfo).getSupportedQualities(DynamicRange.SDR)
-            .associateWith {
-                supportedVideoFrameRates + cameraManager.getAdditionalVideoFrameRates(cameraId, it)
-            }.toMap()
+        videoQualityForDynamicRanges.values.flatten().toSet().associateWith {
+            VideoQualityInfo(
+                it,
+                supportedVideoFrameRates.toMutableSet().apply {
+                    for ((frameRate, remove) in cameraManager.getAdditionalVideoFrameRates(
+                        cameraId, it
+                    )) {
+                        if (remove) {
+                            remove(frameRate)
+                        } else {
+                            add(frameRate)
+                        }
+                    }
+                }.toSet(),
+                videoQualityForDynamicRanges.entries.filter { dynamicRangeToQualities ->
+                    dynamicRangeToQualities.value.contains(it)
+                }.map { dynamicRangeToQualities -> dynamicRangeToQualities.key }.toSet()
+            )
+        }
+
     val supportsVideoRecording = supportedVideoQualities.isNotEmpty()
 
     val supportedExtensionModes = cameraManager.extensionsManager.getSupportedModes(cameraSelector)
diff --git a/app/src/main/java/org/lineageos/aperture/camera/CameraManager.kt b/app/src/main/java/org/lineageos/aperture/camera/CameraManager.kt
index c8c5f9c9..79329a90 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/CameraManager.kt
+++ b/app/src/main/java/org/lineageos/aperture/camera/CameraManager.kt
@@ -12,8 +12,13 @@ import androidx.camera.video.Quality
 import androidx.camera.view.LifecycleCameraController
 import org.lineageos.aperture.R
 import org.lineageos.aperture.ext.*
+import org.lineageos.aperture.models.CameraFacing
+import org.lineageos.aperture.models.CameraMode
+import org.lineageos.aperture.models.CameraType
+import org.lineageos.aperture.models.FrameRate
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
+import kotlin.math.absoluteValue
 
 /**
  * Class managing an app camera session
@@ -26,7 +31,7 @@ class CameraManager(context: Context) {
     val cameraExecutor: ExecutorService = Executors.newSingleThreadExecutor()
 
     private val additionalVideoConfigurations by lazy {
-        mutableMapOf<String, MutableMap<Quality, MutableSet<FrameRate>>>().apply {
+        mutableMapOf<String, MutableMap<Quality, MutableMap<FrameRate, Boolean>>>().apply {
             context.resources.getStringArray(context, R.array.config_additionalVideoConfigurations)
                 .let {
                     if (it.size % 3 != 0) {
@@ -37,8 +42,10 @@ class CameraManager(context: Context) {
                     for (i in it.indices step 3) {
                         val cameraId = it[i]
                         val frameRates = it[i + 2].split("|").mapNotNull { frameRate ->
-                            FrameRate.fromValue(frameRate.toInt())
-                        }
+                            FrameRate.fromValue(frameRate.toInt().absoluteValue)?.let { value ->
+                                value to frameRate.startsWith('-')
+                            }
+                        }.toMap()
 
                         it[i + 1].split("|").mapNotNull { quality ->
                             when (quality) {
@@ -53,9 +60,9 @@ class CameraManager(context: Context) {
                                 this[cameraId] = mutableMapOf()
                             }
                             if (!this[cameraId]!!.containsKey(quality)) {
-                                this[cameraId]!![quality] = mutableSetOf()
+                                this[cameraId]!![quality] = mutableMapOf()
                             }
-                            this[cameraId]!![quality]!!.addAll(frameRates)
+                            this[cameraId]!![quality]!!.putAll(frameRates)
                         }
                     }
                 }
diff --git a/app/src/main/java/org/lineageos/aperture/camera/CameraViewModel.kt b/app/src/main/java/org/lineageos/aperture/camera/CameraViewModel.kt
index 2e88b2d4..c3bd4a97 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/CameraViewModel.kt
+++ b/app/src/main/java/org/lineageos/aperture/camera/CameraViewModel.kt
@@ -9,9 +9,14 @@ import androidx.camera.video.Quality
 import androidx.camera.video.Recording
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import org.lineageos.aperture.utils.GridMode
-import org.lineageos.aperture.utils.Rotation
-import org.lineageos.aperture.utils.TimerMode
+import org.lineageos.aperture.models.CameraMode
+import org.lineageos.aperture.models.CameraState
+import org.lineageos.aperture.models.FlashMode
+import org.lineageos.aperture.models.FrameRate
+import org.lineageos.aperture.models.GridMode
+import org.lineageos.aperture.models.Rotation
+import org.lineageos.aperture.models.TimerMode
+import org.lineageos.aperture.models.VideoDynamicRange
 
 /**
  * [ViewModel] representing a camera session. This data is used to receive
@@ -91,6 +96,11 @@ class CameraViewModel : ViewModel() {
      */
     val videoFrameRate = MutableLiveData<FrameRate?>()
 
+    /**
+     * Video dynamic range.
+     */
+    val videoDynamicRange = MutableLiveData<VideoDynamicRange>()
+
     /**
      * Video mic mode.
      */
diff --git a/app/src/main/java/org/lineageos/aperture/ext/Bitmap.kt b/app/src/main/java/org/lineageos/aperture/ext/Bitmap.kt
index e8849fb9..38a557da 100644
--- a/app/src/main/java/org/lineageos/aperture/ext/Bitmap.kt
+++ b/app/src/main/java/org/lineageos/aperture/ext/Bitmap.kt
@@ -7,7 +7,7 @@ package org.lineageos.aperture.ext
 
 import android.graphics.Bitmap
 import androidx.core.graphics.scale
-import org.lineageos.aperture.utils.ExifUtils.Transform
+import org.lineageos.aperture.models.Transform
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
diff --git a/app/src/main/java/org/lineageos/aperture/ext/CameraController.kt b/app/src/main/java/org/lineageos/aperture/ext/CameraController.kt
index cec02094..bd1d4510 100644
--- a/app/src/main/java/org/lineageos/aperture/ext/CameraController.kt
+++ b/app/src/main/java/org/lineageos/aperture/ext/CameraController.kt
@@ -9,7 +9,7 @@ import androidx.camera.camera2.interop.Camera2CameraControl
 import androidx.camera.core.ImageCapture
 import androidx.camera.core.TorchState
 import androidx.camera.view.CameraController
-import org.lineageos.aperture.camera.FlashMode
+import org.lineageos.aperture.models.FlashMode
 
 var CameraController.flashMode: FlashMode
     get() = when (torchState.value) {
diff --git a/app/src/main/java/org/lineageos/aperture/ext/CaptureRequestOptionsBuilder.kt b/app/src/main/java/org/lineageos/aperture/ext/CaptureRequestOptionsBuilder.kt
index 5f1f9056..ba844bca 100644
--- a/app/src/main/java/org/lineageos/aperture/ext/CaptureRequestOptionsBuilder.kt
+++ b/app/src/main/java/org/lineageos/aperture/ext/CaptureRequestOptionsBuilder.kt
@@ -10,14 +10,14 @@ import android.hardware.camera2.CaptureRequest
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.camera.camera2.interop.CaptureRequestOptions
-import org.lineageos.aperture.camera.ColorCorrectionAberrationMode
-import org.lineageos.aperture.camera.DistortionCorrectionMode
-import org.lineageos.aperture.camera.EdgeMode
-import org.lineageos.aperture.camera.FrameRate
-import org.lineageos.aperture.camera.HotPixelMode
-import org.lineageos.aperture.camera.NoiseReductionMode
-import org.lineageos.aperture.camera.ShadingMode
-import org.lineageos.aperture.camera.VideoStabilizationMode
+import org.lineageos.aperture.models.ColorCorrectionAberrationMode
+import org.lineageos.aperture.models.DistortionCorrectionMode
+import org.lineageos.aperture.models.EdgeMode
+import org.lineageos.aperture.models.FrameRate
+import org.lineageos.aperture.models.HotPixelMode
+import org.lineageos.aperture.models.NoiseReductionMode
+import org.lineageos.aperture.models.ShadingMode
+import org.lineageos.aperture.models.VideoStabilizationMode
 
 @androidx.camera.camera2.interop.ExperimentalCamera2Interop
 fun CaptureRequestOptions.Builder.setFrameRate(frameRate: FrameRate?) {
diff --git a/app/src/main/java/org/lineageos/aperture/ext/SharedPreferences.kt b/app/src/main/java/org/lineageos/aperture/ext/SharedPreferences.kt
index c4eac577..209e811e 100644
--- a/app/src/main/java/org/lineageos/aperture/ext/SharedPreferences.kt
+++ b/app/src/main/java/org/lineageos/aperture/ext/SharedPreferences.kt
@@ -12,19 +12,21 @@ import androidx.camera.core.ImageCapture
 import androidx.camera.extensions.ExtensionMode
 import androidx.camera.video.Quality
 import androidx.core.content.edit
-import org.lineageos.aperture.camera.CameraFacing
-import org.lineageos.aperture.camera.CameraMode
-import org.lineageos.aperture.camera.ColorCorrectionAberrationMode
-import org.lineageos.aperture.camera.DistortionCorrectionMode
-import org.lineageos.aperture.camera.EdgeMode
-import org.lineageos.aperture.camera.FlashMode
-import org.lineageos.aperture.camera.FrameRate
-import org.lineageos.aperture.camera.HotPixelMode
-import org.lineageos.aperture.camera.NoiseReductionMode
-import org.lineageos.aperture.camera.ShadingMode
-import org.lineageos.aperture.utils.GestureActions
-import org.lineageos.aperture.utils.GridMode
-import org.lineageos.aperture.utils.TimerMode
+import org.lineageos.aperture.models.CameraFacing
+import org.lineageos.aperture.models.CameraMode
+import org.lineageos.aperture.models.ColorCorrectionAberrationMode
+import org.lineageos.aperture.models.DistortionCorrectionMode
+import org.lineageos.aperture.models.EdgeMode
+import org.lineageos.aperture.models.FlashMode
+import org.lineageos.aperture.models.FrameRate
+import org.lineageos.aperture.models.GestureActions
+import org.lineageos.aperture.models.GridMode
+import org.lineageos.aperture.models.HotPixelMode
+import org.lineageos.aperture.models.NoiseReductionMode
+import org.lineageos.aperture.models.ShadingMode
+import org.lineageos.aperture.models.TimerMode
+import org.lineageos.aperture.models.VideoDynamicRange
+import org.lineageos.aperture.models.VideoMirrorMode
 
 // Helpers
 internal fun SharedPreferences.getBoolean(key: String): Boolean? {
@@ -445,3 +447,42 @@ internal var SharedPreferences.forceTorchHelpShown: Boolean
     set(value) = edit {
         putBoolean(FORCE_TORCH_HELP_SHOWN_KEY, value)
     }
+
+// Video dynamic range
+private const val VIDEO_DYNAMIC_RANGE_KEY = "video_dynamic_range"
+private const val VIDEO_DYNAMIC_RANGE_DEFAULT = "sdr"
+internal var SharedPreferences.videoDynamicRange: VideoDynamicRange
+    get() = when (getString(VIDEO_DYNAMIC_RANGE_KEY, VIDEO_DYNAMIC_RANGE_DEFAULT)) {
+        "sdr" -> VideoDynamicRange.SDR
+        "hlg_10_bit" -> VideoDynamicRange.HLG_10_BIT
+        "hdr10_10_bit" -> VideoDynamicRange.HDR10_10_BIT
+        "hdr10_plus_10_bit" -> VideoDynamicRange.HDR10_PLUS_10_BIT
+        "dolby_vision_10_bit" -> VideoDynamicRange.DOLBY_VISION_10_BIT
+        "dolby_vision_8_bit" -> VideoDynamicRange.DOLBY_VISION_8_BIT
+        // Default to sdr
+        else -> VideoDynamicRange.SDR
+    }
+    set(value) = edit {
+        putString(
+            VIDEO_DYNAMIC_RANGE_KEY, when (value) {
+                VideoDynamicRange.SDR -> "sdr"
+                VideoDynamicRange.HLG_10_BIT -> "hlg_10_bit"
+                VideoDynamicRange.HDR10_10_BIT -> "hdr10_10_bit"
+                VideoDynamicRange.HDR10_PLUS_10_BIT -> "hdr10_plus_10_bit"
+                VideoDynamicRange.DOLBY_VISION_10_BIT -> "dolby_vision_10_bit"
+                VideoDynamicRange.DOLBY_VISION_8_BIT -> "dolby_vision_8_bit"
+            }
+        )
+    }
+
+// Video mirror mode
+private const val VIDEO_MIRROR_MODE_KEY = "video_mirror_mode"
+private const val VIDEO_MIRROR_MODE_DEFAULT = "off"
+internal val SharedPreferences.videoMirrorMode: VideoMirrorMode
+    get() = when (getString(VIDEO_MIRROR_MODE_KEY, VIDEO_MIRROR_MODE_DEFAULT)) {
+        "off" -> VideoMirrorMode.OFF
+        "on" -> VideoMirrorMode.ON
+        "on_ffc_only" -> VideoMirrorMode.ON_FFC_ONLY
+        // Default to off
+        else -> VideoMirrorMode.OFF
+    }
diff --git a/app/src/main/java/org/lineageos/aperture/ext/View.kt b/app/src/main/java/org/lineageos/aperture/ext/View.kt
index 88678d25..eae909c0 100644
--- a/app/src/main/java/org/lineageos/aperture/ext/View.kt
+++ b/app/src/main/java/org/lineageos/aperture/ext/View.kt
@@ -11,7 +11,7 @@ import android.view.animation.AlphaAnimation
 import android.view.animation.AnimationSet
 import android.view.animation.TranslateAnimation
 import androidx.core.view.isVisible
-import org.lineageos.aperture.utils.Rotation
+import org.lineageos.aperture.models.Rotation
 
 internal fun View.setPadding(value: Int) {
     setPadding(value, value, value, value)
diff --git a/app/src/main/java/org/lineageos/aperture/utils/AssistantIntent.kt b/app/src/main/java/org/lineageos/aperture/models/AssistantIntent.kt
similarity index 97%
rename from app/src/main/java/org/lineageos/aperture/utils/AssistantIntent.kt
rename to app/src/main/java/org/lineageos/aperture/models/AssistantIntent.kt
index 9e939e8d..6018aa8e 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/AssistantIntent.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/AssistantIntent.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.utils
+package org.lineageos.aperture.models
 
 import android.content.Intent
 
diff --git a/app/src/main/java/org/lineageos/aperture/camera/CameraFacing.kt b/app/src/main/java/org/lineageos/aperture/models/CameraFacing.kt
similarity index 90%
rename from app/src/main/java/org/lineageos/aperture/camera/CameraFacing.kt
rename to app/src/main/java/org/lineageos/aperture/models/CameraFacing.kt
index 7af40eb7..2c01a118 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/CameraFacing.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/CameraFacing.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 enum class CameraFacing(
     val cameraType: CameraType,
diff --git a/app/src/main/java/org/lineageos/aperture/camera/CameraMode.kt b/app/src/main/java/org/lineageos/aperture/models/CameraMode.kt
similarity index 89%
rename from app/src/main/java/org/lineageos/aperture/camera/CameraMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/CameraMode.kt
index de5a43fe..950e5797 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/CameraMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/CameraMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 import androidx.annotation.StringRes
 import org.lineageos.aperture.R
diff --git a/app/src/main/java/org/lineageos/aperture/camera/CameraState.kt b/app/src/main/java/org/lineageos/aperture/models/CameraState.kt
similarity index 88%
rename from app/src/main/java/org/lineageos/aperture/camera/CameraState.kt
rename to app/src/main/java/org/lineageos/aperture/models/CameraState.kt
index 02ebfe98..8d326213 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/CameraState.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/CameraState.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 enum class CameraState(
     val isRecordingVideo: Boolean = false,
diff --git a/app/src/main/java/org/lineageos/aperture/camera/CameraType.kt b/app/src/main/java/org/lineageos/aperture/models/CameraType.kt
similarity index 89%
rename from app/src/main/java/org/lineageos/aperture/camera/CameraType.kt
rename to app/src/main/java/org/lineageos/aperture/models/CameraType.kt
index c64bd56a..a876a3f6 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/CameraType.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/CameraType.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 /**
  * [Camera] type.
diff --git a/app/src/main/java/org/lineageos/aperture/camera/ColorCorrectionAberrationMode.kt b/app/src/main/java/org/lineageos/aperture/models/ColorCorrectionAberrationMode.kt
similarity index 95%
rename from app/src/main/java/org/lineageos/aperture/camera/ColorCorrectionAberrationMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/ColorCorrectionAberrationMode.kt
index 34f57ed1..d593bdf0 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/ColorCorrectionAberrationMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/ColorCorrectionAberrationMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 enum class ColorCorrectionAberrationMode {
     OFF,
diff --git a/app/src/main/java/org/lineageos/aperture/camera/DistortionCorrectionMode.kt b/app/src/main/java/org/lineageos/aperture/models/DistortionCorrectionMode.kt
similarity index 95%
rename from app/src/main/java/org/lineageos/aperture/camera/DistortionCorrectionMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/DistortionCorrectionMode.kt
index 3b17c80e..78f6b0c8 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/DistortionCorrectionMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/DistortionCorrectionMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 enum class DistortionCorrectionMode {
     OFF,
diff --git a/app/src/main/java/org/lineageos/aperture/camera/EdgeMode.kt b/app/src/main/java/org/lineageos/aperture/models/EdgeMode.kt
similarity index 95%
rename from app/src/main/java/org/lineageos/aperture/camera/EdgeMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/EdgeMode.kt
index 4c94da05..4a65a8de 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/EdgeMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/EdgeMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 enum class EdgeMode {
     OFF,
diff --git a/app/src/main/java/org/lineageos/aperture/camera/FlashMode.kt b/app/src/main/java/org/lineageos/aperture/models/FlashMode.kt
similarity index 96%
rename from app/src/main/java/org/lineageos/aperture/camera/FlashMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/FlashMode.kt
index 80adf8c7..d0317aba 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/FlashMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/FlashMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 enum class FlashMode {
     /**
diff --git a/app/src/main/java/org/lineageos/aperture/camera/FrameRate.kt b/app/src/main/java/org/lineageos/aperture/models/FrameRate.kt
similarity index 96%
rename from app/src/main/java/org/lineageos/aperture/camera/FrameRate.kt
rename to app/src/main/java/org/lineageos/aperture/models/FrameRate.kt
index d066ba64..e07cd932 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/FrameRate.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/FrameRate.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 import android.util.Range
 
diff --git a/app/src/main/java/org/lineageos/aperture/utils/GestureActions.kt b/app/src/main/java/org/lineageos/aperture/models/GestureActions.kt
similarity index 85%
rename from app/src/main/java/org/lineageos/aperture/utils/GestureActions.kt
rename to app/src/main/java/org/lineageos/aperture/models/GestureActions.kt
index 09ab8d79..8ec998a3 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/GestureActions.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/GestureActions.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.utils
+package org.lineageos.aperture.models
 
 /**
  * Available gesture actions.
diff --git a/app/src/main/java/org/lineageos/aperture/utils/GridMode.kt b/app/src/main/java/org/lineageos/aperture/models/GridMode.kt
similarity index 82%
rename from app/src/main/java/org/lineageos/aperture/utils/GridMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/GridMode.kt
index 5342f67a..abfddde8 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/GridMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/GridMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.utils
+package org.lineageos.aperture.models
 
 enum class GridMode {
     OFF,
diff --git a/app/src/main/java/org/lineageos/aperture/camera/HotPixelMode.kt b/app/src/main/java/org/lineageos/aperture/models/HotPixelMode.kt
similarity index 95%
rename from app/src/main/java/org/lineageos/aperture/camera/HotPixelMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/HotPixelMode.kt
index df772d18..6269e5fe 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/HotPixelMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/HotPixelMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 enum class HotPixelMode {
     OFF,
diff --git a/app/src/main/java/org/lineageos/aperture/utils/MediaType.kt b/app/src/main/java/org/lineageos/aperture/models/MediaType.kt
similarity index 79%
rename from app/src/main/java/org/lineageos/aperture/utils/MediaType.kt
rename to app/src/main/java/org/lineageos/aperture/models/MediaType.kt
index 491291c5..9cc9577b 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/MediaType.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/MediaType.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.utils
+package org.lineageos.aperture.models
 
 enum class MediaType {
     PHOTO,
diff --git a/app/src/main/java/org/lineageos/aperture/camera/NoiseReductionMode.kt b/app/src/main/java/org/lineageos/aperture/models/NoiseReductionMode.kt
similarity index 95%
rename from app/src/main/java/org/lineageos/aperture/camera/NoiseReductionMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/NoiseReductionMode.kt
index 9044e404..720bf8a0 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/NoiseReductionMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/NoiseReductionMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 enum class NoiseReductionMode {
     OFF,
diff --git a/app/src/main/java/org/lineageos/aperture/utils/Rotation.kt b/app/src/main/java/org/lineageos/aperture/models/Rotation.kt
similarity index 98%
rename from app/src/main/java/org/lineageos/aperture/utils/Rotation.kt
rename to app/src/main/java/org/lineageos/aperture/models/Rotation.kt
index 0291baa6..11c5b970 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/Rotation.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/Rotation.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.utils
+package org.lineageos.aperture.models
 
 /**
  * Rotation utils.
diff --git a/app/src/main/java/org/lineageos/aperture/camera/ShadingMode.kt b/app/src/main/java/org/lineageos/aperture/models/ShadingMode.kt
similarity index 95%
rename from app/src/main/java/org/lineageos/aperture/camera/ShadingMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/ShadingMode.kt
index 00d93933..0bbdcd1b 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/ShadingMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/ShadingMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
 
 enum class ShadingMode {
     OFF,
diff --git a/app/src/main/java/org/lineageos/aperture/utils/TimerMode.kt b/app/src/main/java/org/lineageos/aperture/models/TimerMode.kt
similarity index 88%
rename from app/src/main/java/org/lineageos/aperture/utils/TimerMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/TimerMode.kt
index 204aee4f..898bc476 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/TimerMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/TimerMode.kt
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.utils
+package org.lineageos.aperture.models
 
 enum class TimerMode(val seconds: Int) {
     OFF(0),
diff --git a/app/src/main/java/org/lineageos/aperture/models/Transform.kt b/app/src/main/java/org/lineageos/aperture/models/Transform.kt
new file mode 100644
index 00000000..65838b6e
--- /dev/null
+++ b/app/src/main/java/org/lineageos/aperture/models/Transform.kt
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.lineageos.aperture.models
+
+import android.graphics.Matrix
+
+data class Transform(val rotation: Rotation, val mirror: Boolean) {
+    fun toMatrix() = Matrix().apply {
+        if (mirror) {
+            postScale(-1f, 1f)
+        }
+
+        postRotate(rotation.offset.toFloat())
+    }
+
+    companion object {
+        val DEFAULT = Transform(Rotation.ROTATION_0, false)
+    }
+}
diff --git a/app/src/main/java/org/lineageos/aperture/models/VideoDynamicRange.kt b/app/src/main/java/org/lineageos/aperture/models/VideoDynamicRange.kt
new file mode 100644
index 00000000..e4541b40
--- /dev/null
+++ b/app/src/main/java/org/lineageos/aperture/models/VideoDynamicRange.kt
@@ -0,0 +1,60 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2023 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.lineageos.aperture.models
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.camera.core.DynamicRange
+import org.lineageos.aperture.R
+
+/**
+ * Video dynamic range.
+ * @param dynamicRange The [DynamicRange] it refers to
+ * @param title A string resource used to represent the dynamic range
+ * @param icon An icon resource used to represent the dynamic range
+ */
+enum class VideoDynamicRange(
+    val dynamicRange: DynamicRange,
+    @StringRes val title: Int,
+    @DrawableRes val icon: Int,
+) {
+    SDR(
+        DynamicRange.SDR,
+        R.string.video_dynamic_range_sdr,
+        R.drawable.ic_hdr_off,
+    ),
+    HLG_10_BIT(
+        DynamicRange.HLG_10_BIT,
+        R.string.video_dynamic_range_hlg_10_bit,
+        R.drawable.ic_hdr_on,
+    ),
+    HDR10_10_BIT(
+        DynamicRange.HDR10_10_BIT,
+        R.string.video_dynamic_range_hdr10_10_bit,
+        R.drawable.ic_hdr_on,
+    ),
+    HDR10_PLUS_10_BIT(
+        DynamicRange.HDR10_PLUS_10_BIT,
+        R.string.video_dynamic_range_hdr10_plus_10_bit,
+        R.drawable.ic_hdr_off,
+    ),
+    DOLBY_VISION_10_BIT(
+        DynamicRange.DOLBY_VISION_10_BIT,
+        R.string.video_dynamic_range_dolby_vision_10_bit,
+        R.drawable.ic_dolby,
+    ),
+    DOLBY_VISION_8_BIT(
+        DynamicRange.DOLBY_VISION_8_BIT,
+        R.string.video_dynamic_range_dolby_vision_8_bit,
+        R.drawable.ic_dolby,
+    );
+
+    companion object {
+        fun fromDynamicRange(dynamicRange: DynamicRange) = values().first {
+            it.dynamicRange == dynamicRange
+        }
+    }
+}
diff --git a/app/src/main/java/org/lineageos/aperture/models/VideoMirrorMode.kt b/app/src/main/java/org/lineageos/aperture/models/VideoMirrorMode.kt
new file mode 100644
index 00000000..d618cbaa
--- /dev/null
+++ b/app/src/main/java/org/lineageos/aperture/models/VideoMirrorMode.kt
@@ -0,0 +1,15 @@
+/*
+ * SPDX-FileCopyrightText: 2022-2023 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.lineageos.aperture.models
+
+/**
+ * Video mirror mode.
+ */
+enum class VideoMirrorMode {
+    OFF,
+    ON,
+    ON_FFC_ONLY,
+}
diff --git a/app/src/main/java/org/lineageos/aperture/models/VideoQualityInfo.kt b/app/src/main/java/org/lineageos/aperture/models/VideoQualityInfo.kt
new file mode 100644
index 00000000..bd017aee
--- /dev/null
+++ b/app/src/main/java/org/lineageos/aperture/models/VideoQualityInfo.kt
@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.lineageos.aperture.models
+
+import androidx.camera.video.Quality
+
+/**
+ * Video [Quality] info.
+ * @param quality The quality
+ * @param supportedFrameRates The supported frame rates for this quality
+ * @param supportedDynamicRanges The supported dynamic ranges for this quality
+ */
+data class VideoQualityInfo(
+    val quality: Quality,
+    val supportedFrameRates: Set<FrameRate>,
+    val supportedDynamicRanges: Set<VideoDynamicRange>,
+)
diff --git a/app/src/main/java/org/lineageos/aperture/camera/VideoStabilizationMode.kt b/app/src/main/java/org/lineageos/aperture/models/VideoStabilizationMode.kt
similarity index 84%
rename from app/src/main/java/org/lineageos/aperture/camera/VideoStabilizationMode.kt
rename to app/src/main/java/org/lineageos/aperture/models/VideoStabilizationMode.kt
index 9f832eab..13de65ca 100644
--- a/app/src/main/java/org/lineageos/aperture/camera/VideoStabilizationMode.kt
+++ b/app/src/main/java/org/lineageos/aperture/models/VideoStabilizationMode.kt
@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.lineageos.aperture.camera
+package org.lineageos.aperture.models
+
+import org.lineageos.aperture.camera.Camera
 
 enum class VideoStabilizationMode {
     OFF,
diff --git a/app/src/main/java/org/lineageos/aperture/ui/CameraModeSelectorLayout.kt b/app/src/main/java/org/lineageos/aperture/ui/CameraModeSelectorLayout.kt
index 2cb81211..c61207a7 100644
--- a/app/src/main/java/org/lineageos/aperture/ui/CameraModeSelectorLayout.kt
+++ b/app/src/main/java/org/lineageos/aperture/ui/CameraModeSelectorLayout.kt
@@ -18,12 +18,11 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import com.google.android.material.button.MaterialButton
 import org.lineageos.aperture.R
-import org.lineageos.aperture.camera.CameraMode
-import org.lineageos.aperture.camera.CameraState
 import org.lineageos.aperture.camera.CameraViewModel
 import org.lineageos.aperture.ext.px
+import org.lineageos.aperture.models.CameraMode
+import org.lineageos.aperture.models.CameraState
 import org.lineageos.aperture.utils.TimeUtils
-import java.lang.Exception
 import kotlin.reflect.cast
 
 class CameraModeSelectorLayout @JvmOverloads constructor(
diff --git a/app/src/main/java/org/lineageos/aperture/ui/CapturePreviewLayout.kt b/app/src/main/java/org/lineageos/aperture/ui/CapturePreviewLayout.kt
index 2d18befc..1c42e1c6 100644
--- a/app/src/main/java/org/lineageos/aperture/ui/CapturePreviewLayout.kt
+++ b/app/src/main/java/org/lineageos/aperture/ui/CapturePreviewLayout.kt
@@ -21,9 +21,9 @@ import androidx.media3.ui.PlayerView
 import org.lineageos.aperture.R
 import org.lineageos.aperture.camera.CameraViewModel
 import org.lineageos.aperture.ext.*
+import org.lineageos.aperture.models.MediaType
+import org.lineageos.aperture.models.Rotation
 import org.lineageos.aperture.utils.ExifUtils
-import org.lineageos.aperture.utils.MediaType
-import org.lineageos.aperture.utils.Rotation
 import java.io.InputStream
 
 /**
@@ -70,6 +70,10 @@ class CapturePreviewLayout(context: Context, attrs: AttributeSet?) : ConstraintL
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         super.onLayout(changed, left, top, right, bottom)
 
+        setOnClickListener {
+            // Prevent clicks behind the view
+        }
+
         cancelButton.setOnClickListener {
             stopPreview()
             onChoiceCallback(null)
diff --git a/app/src/main/java/org/lineageos/aperture/ui/CountDownView.kt b/app/src/main/java/org/lineageos/aperture/ui/CountDownView.kt
index 3f11ea79..fd3ec1e9 100644
--- a/app/src/main/java/org/lineageos/aperture/ui/CountDownView.kt
+++ b/app/src/main/java/org/lineageos/aperture/ui/CountDownView.kt
@@ -23,7 +23,7 @@ import androidx.lifecycle.findViewTreeLifecycleOwner
 import org.lineageos.aperture.R
 import org.lineageos.aperture.camera.CameraViewModel
 import org.lineageos.aperture.ext.*
-import org.lineageos.aperture.utils.Rotation
+import org.lineageos.aperture.models.Rotation
 
 /**
  * This class manages the looks of the countdown.
diff --git a/app/src/main/java/org/lineageos/aperture/ui/GridView.kt b/app/src/main/java/org/lineageos/aperture/ui/GridView.kt
index bab6e0ae..fd1884a7 100644
--- a/app/src/main/java/org/lineageos/aperture/ui/GridView.kt
+++ b/app/src/main/java/org/lineageos/aperture/ui/GridView.kt
@@ -14,7 +14,7 @@ import android.view.TextureView
 import android.view.View
 import androidx.camera.view.PreviewView
 import androidx.core.view.children
-import org.lineageos.aperture.utils.GridMode
+import org.lineageos.aperture.models.GridMode
 import kotlin.math.roundToInt
 
 /**
diff --git a/app/src/main/java/org/lineageos/aperture/ui/InfoChipView.kt b/app/src/main/java/org/lineageos/aperture/ui/InfoChipView.kt
index c28b5afc..bc278f90 100644
--- a/app/src/main/java/org/lineageos/aperture/ui/InfoChipView.kt
+++ b/app/src/main/java/org/lineageos/aperture/ui/InfoChipView.kt
@@ -19,9 +19,9 @@ import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.Observer
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import org.lineageos.aperture.R
-import org.lineageos.aperture.camera.CameraMode
 import org.lineageos.aperture.camera.CameraViewModel
-import org.lineageos.aperture.utils.Rotation
+import org.lineageos.aperture.models.CameraMode
+import org.lineageos.aperture.models.Rotation
 import kotlin.math.roundToInt
 
 class InfoChipView @JvmOverloads constructor(
diff --git a/app/src/main/java/org/lineageos/aperture/ui/LensSelectorLayout.kt b/app/src/main/java/org/lineageos/aperture/ui/LensSelectorLayout.kt
index 9149d7a3..7958ecfc 100644
--- a/app/src/main/java/org/lineageos/aperture/ui/LensSelectorLayout.kt
+++ b/app/src/main/java/org/lineageos/aperture/ui/LensSelectorLayout.kt
@@ -18,10 +18,10 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import org.lineageos.aperture.R
 import org.lineageos.aperture.camera.Camera
-import org.lineageos.aperture.camera.CameraState
 import org.lineageos.aperture.camera.CameraViewModel
 import org.lineageos.aperture.ext.*
-import org.lineageos.aperture.utils.Rotation
+import org.lineageos.aperture.models.CameraState
+import org.lineageos.aperture.models.Rotation
 import java.util.Locale
 
 @androidx.camera.camera2.interop.ExperimentalCamera2Interop
diff --git a/app/src/main/java/org/lineageos/aperture/ui/Slider.kt b/app/src/main/java/org/lineageos/aperture/ui/Slider.kt
index 6b442101..c1abfe17 100644
--- a/app/src/main/java/org/lineageos/aperture/ui/Slider.kt
+++ b/app/src/main/java/org/lineageos/aperture/ui/Slider.kt
@@ -19,7 +19,7 @@ import android.util.AttributeSet
 import android.view.View
 import org.lineageos.aperture.R
 import org.lineageos.aperture.ext.*
-import org.lineageos.aperture.utils.Rotation
+import org.lineageos.aperture.models.Rotation
 
 @Suppress("PrivateResource")
 abstract class Slider @JvmOverloads constructor(
diff --git a/app/src/main/java/org/lineageos/aperture/utils/ExifUtils.kt b/app/src/main/java/org/lineageos/aperture/utils/ExifUtils.kt
index 4e6cf076..a0d040dd 100644
--- a/app/src/main/java/org/lineageos/aperture/utils/ExifUtils.kt
+++ b/app/src/main/java/org/lineageos/aperture/utils/ExifUtils.kt
@@ -5,26 +5,12 @@
 
 package org.lineageos.aperture.utils
 
-import android.graphics.Matrix
 import androidx.exifinterface.media.ExifInterface
+import org.lineageos.aperture.models.Rotation
+import org.lineageos.aperture.models.Transform
 import java.io.InputStream
 
 class ExifUtils {
-    data class Transform(val rotation: Rotation, val mirror: Boolean) {
-        fun toMatrix(): Matrix {
-            return Matrix().apply {
-                if (mirror) {
-                    postScale(-1f, 1f)
-                }
-                postRotate(rotation.offset.toFloat())
-            }
-        }
-
-        companion object {
-            val DEFAULT = Transform(Rotation.ROTATION_0, false)
-        }
-    }
-
     companion object {
         private val orientationMap = mapOf(
             ExifInterface.ORIENTATION_UNDEFINED to Transform.DEFAULT,
diff --git a/app/src/main/res/drawable/ic_dolby.xml b/app/src/main/res/drawable/ic_dolby.xml
new file mode 100644
index 00000000..421d5352
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dolby.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Dolby Laboratories Inc.
+     SPDX-License-Identifier: CC-PDDC
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="279.08dp"
+    android:height="193.28dp"
+    android:tint="#000000"
+    android:viewportWidth="279.08"
+    android:viewportHeight="193.28">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="m279.08,193.28h-28.14c-53.82,0 -96.64,-44.04 -96.64,-96.64C154.31,44.04 198.35,0 250.95,0h28.14z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="m0,0h28.14c53.82,0 96.64,44.04 96.64,96.64 0,52.6 -44.04,96.64 -96.64,96.64H0Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_hdr_off.xml b/app/src/main/res/drawable/ic_hdr_off.xml
new file mode 100644
index 00000000..e6f21d99
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hdr_off.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17.5,15v-2h1.1l0.9,2L21,15l-0.9,-2.1c0.5,-0.2 0.9,-0.8 0.9,-1.4v-1c0,-0.8 -0.7,-1.5 -1.5,-1.5L16,9v4.9l1.1,1.1h0.4zM17.5,10.5h2v1h-2v-1zM13,10.5v0.4l1.5,1.5v-1.9c0,-0.8 -0.7,-1.5 -1.5,-1.5h-1.9l1.5,1.5h0.4zM9.5,9.5l-7,-7 -1.1,1L6.9,9h-0.4v2h-2L4.5,9L3,9v6h1.5v-2.5h2L6.5,15L8,15v-4.9l1.5,1.5L9.5,15h3.4l7.6,7.6 1.1,-1.1 -12.1,-12z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_hdr_on.xml b/app/src/main/res/drawable/ic_hdr_on.xml
new file mode 100644
index 00000000..4b9a9967
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hdr_on.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: Material Design Authors / Google LLC
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M21,11.5v-1c0,-0.8 -0.7,-1.5 -1.5,-1.5L16,9v6h1.5v-2h1.1l0.9,2L21,15l-0.9,-2.1c0.5,-0.3 0.9,-0.8 0.9,-1.4zM19.5,11.5h-2v-1h2v1zM6.5,11h-2L4.5,9L3,9v6h1.5v-2.5h2L6.5,15L8,15L8,9L6.5,9v2zM13,9L9.5,9v6L13,15c0.8,0 1.5,-0.7 1.5,-1.5v-3c0,-0.8 -0.7,-1.5 -1.5,-1.5zM13,13.5h-2v-3h2v3z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
index 96783f49..9d9ca5a9 100644
--- a/app/src/main/res/layout/activity_camera.xml
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -174,10 +174,20 @@
                 android:drawableTop="@drawable/ic_video_frame_rate"
                 android:text="@string/video_framerate_auto"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/micButton"
+                app:layout_constraintEnd_toStartOf="@+id/videoDynamicRangeButton"
                 app:layout_constraintStart_toEndOf="@+id/videoQualityButton"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <Button
+                android:id="@+id/videoDynamicRangeButton"
+                style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
+                android:drawableTop="@drawable/ic_hdr_off"
+                android:text="@string/video_dynamic_range_sdr"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/micButton"
+                app:layout_constraintStart_toEndOf="@+id/videoFrameRateButton"
+                app:layout_constraintTop_toTopOf="parent" />
+
             <Button
                 android:id="@+id/micButton"
                 style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
@@ -185,7 +195,7 @@
                 android:text="@string/mic_off"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/timerButton"
-                app:layout_constraintStart_toEndOf="@+id/videoFrameRateButton"
+                app:layout_constraintStart_toEndOf="@+id/videoDynamicRangeButton"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <!-- Common settings -->
diff --git a/app/src/main/res/layout/capture_preview_layout.xml b/app/src/main/res/layout/capture_preview_layout.xml
index 60a1ba91..3ab65531 100644
--- a/app/src/main/res/layout/capture_preview_layout.xml
+++ b/app/src/main/res/layout/capture_preview_layout.xml
@@ -7,8 +7,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black"
-    android:onClick="preventClicks">
+    android:background="@android:color/black">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/buttonsLayout"
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 84f750b9..ab2e0b7f 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -13,7 +13,7 @@
     <string name="gallery_button_description">Qalereya</string>
     <string name="google_lens_button_description">Google Lens-i aç</string>
     <string name="image_view_description">Şəklə önbaxış</string>
-    <string name="pro_button_description">Pro tənzimləmələr</string>
+    <string name="pro_button_description">Pro ayarları</string>
     <string name="shutter_button_description">Sürgü</string>
     <string name="video_recording_state_button_description">Videoyazıya fasilə ver/davam etdir</string>
     <string name="timer_off">TAYMER BAĞLIDIR</string>
@@ -31,7 +31,7 @@
     <string name="grid_on_goldenratio">TOR φ</string>
     <string name="mic_off">MİKRF BAĞLIDIR</string>
     <string name="mic_on">MİKRF AÇIQDIR</string>
-    <string name="settings">TƏNZİMLƏMƏLƏR</string>
+    <string name="settings">AYARLAR</string>
     <string name="app_permissions_toast">İstifadəçi tərəfindən verilməyən icazələr.</string>
     <string name="camcorder_unsupported_toast">Heç bir kamera videoyazını dəstəkləmir.</string>
     <string name="qr_copy_description">Lövhəyə kopyala</string>
@@ -40,7 +40,7 @@
     <string name="qr_wifi_title">Bu Wi-Fi şəbəkəsinə bağlan</string>
     <string name="qr_dpp_description">Bu cihazı konfiqurasiya et</string>
     <string name="qr_text">Mətn</string>
-    <string name="title_activity_settings">Tənzimləmələr</string>
+    <string name="title_activity_settings">Ayarlar</string>
     <string name="general_header">Ümumi</string>
     <string name="photos_header">Fotolar</string>
     <string name="video_header">Video</string>
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">Ön kamera fotolarını önbaxışda göründüyü kimi saxla</string>
     <string name="video_stabilization_title">Video sabitləməni fəallaşdır</string>
     <string name="video_stabilization_summary">Mövcuddursa, çəkiliş əsnasında kamera titrəmələrini azaltmaq üçün video sabitləməni fəallaşdır</string>
+    <string name="video_mirror_mode_title">Videonun əks etdirilməsini fəallaşdır</string>
     <string name="processing_title">Emal olunur</string>
     <string name="processing_info">Foto rejimində, ZSL rejimi istifadə edildikdə, yalnız ilkin və bağlı dəyərlər nəzərə alınacaq. Video rejimi üçün yalnız ilkin, bağlı və sürətli dəyərlər nəzərə alınacaq.</string>
     <string name="edge_mode_title">Kəskinlik</string>
@@ -73,7 +74,7 @@
     <string name="edge_mode_fast">Sürətli</string>
     <string name="edge_mode_high_quality">Yüksək keyfiyyət</string>
     <string name="noise_reduction_mode_title">Səs-küyü azaltma</string>
-    <string name="noise_reduction_mode_summary">Səs-küy azaltm alqoritmi, xüsusilə qaranlıq şəraitdə, yaxalama prosesi tərəfindən əlavə edilən həddən artıq səs-küyü aradan qaldıraraq təsvir keyfiyyətini yaxşılaşdırır.</string>
+    <string name="noise_reduction_mode_summary">Səs-küy azaltma alqoritmi, xüsusilə qaranlıq şəraitdə, yaxalama prosesi tərəfindən əlavə edilən həddən artıq səs-küyü aradan qaldıraraq təsvir keyfiyyətini yaxşılaşdırır.</string>
     <string name="noise_reduction_mode_default">İlkin</string>
     <string name="noise_reduction_mode_off">Bağlı</string>
     <string name="noise_reduction_mode_fast">Sürətli</string>
@@ -112,13 +113,13 @@
     <string name="location_permission_dialog_turn_on">İşə sal</string>
     <string name="error_max_cameras_in_use">Maksimum açıq kamera sayına çatıldı, cihazın kameralarını istifadə edərək digər tətbiqləri bağlamağa çalışın.</string>
     <string name="error_camera_in_use">Bu kamera artıq istifadədədir, onu istifadə edərək tətbiqi bağlamağa çalışın.</string>
-    <string name="error_stream_config">Axın hazırlanarkən bir xəta baş verdi. Zəhmət olmasa bunu tərtibatçılara bildirin.</string>
+    <string name="error_stream_config">Axın hazırlanarkən bir xəta baş verdi. Lütfən bunu tərtibatçılara bildirin.</string>
     <string name="error_other_recoverable_error">Seans qurularkən xəta baş verdi. Tətbiq bərpa etməyə çalışacaq.</string>
     <string name="error_camera_disabled">Kamera sıradan çıxarıldı. Bunun səbəbi cihaz siyasəti ola bilər.</string>
     <string name="error_camera_fatal_error">Qaçılmaz xəta ilə qarşılaşıldı. Cihazınızı yenidən başlatmağa çalışın.</string>
     <string name="error_do_not_disturb_mode_enabled">Narahat Etməyin rejimi fəaldır. Sıradan çıxardıb tətbiqi yenidən açın.</string>
-    <string name="error_unknown_recoverable">Bərpa edilə bilən bir bilinməyən xəta tapıldı. Zəhmət olmasa bunu tərtibatçılara bildirin.</string>
-    <string name="error_unknown_critical">Kritik bir bilinməyən xəta tapıldı. Zəhmət olmasa bunu tərtibatçılara bildirin.</string>
+    <string name="error_unknown_recoverable">Bərpa edilə bilən bir bilinməyən xəta tapıldı. Lütfən bunu tərtibatçılara bildirin.</string>
+    <string name="error_unknown_critical">Kritik bir bilinməyən xəta tapıldı. Lütfən bunu tərtibatçılara bildirin.</string>
     <string name="gesture_action_shutter">Sürgü</string>
     <string name="gesture_action_zoom">Yaxınlaşdır</string>
     <string name="gesture_action_volume">Səs</string>
@@ -132,4 +133,7 @@
     <string name="camera_mode_photo">Foto</string>
     <string name="camera_mode_video">Video</string>
     <string name="camera_mode_qr">Skan</string>
+    <string name="video_mirror_mode_off">Bağlı</string>
+    <string name="video_mirror_mode_on">Açıq</string>
+    <string name="video_mirror_mode_on_ffc_only">Yalnız önə baxan kamera</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 6c157d1e..a183ddd4 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">Desa les fotos de la càmera frontal tal com apareixen a la vista prèvia</string>
     <string name="video_stabilization_title">Activa l\'estabilització de vídeo</string>
     <string name="video_stabilization_summary">Quan estigui disponible, activeu l\'estabilització de vídeo per reduir les vibracions de la càmera durant la gravació</string>
+    <string name="video_mirror_mode_title">Activa el mirall de la càmera</string>
     <string name="processing_title">Processant</string>
     <string name="processing_info">En mode foto, quan s\'utilitza el mode ZSL, només es tindran en compte els valors per defecte i desactivats. Per al mode de vídeo, només es tindran en compte els valors per defecte, desactivats i ràpids.</string>
     <string name="edge_mode_title">Nitidesa</string>
@@ -129,4 +130,10 @@
     <string name="thermal_status_emergency">L\'acceleració tèrmica està en estat d\'emergència, l\'aplicació es tancarà ara.</string>
     <string name="thermal_status_shutdown">Apagada deguda a l\'acceleració tèrmica, el dispositiu s\'apagarà.</string>
     <string name="force_torch_help">En mode foto, podeu prémer prolongadament el botó del flaix per activar el flaix.</string>
+    <string name="camera_mode_photo">Foto</string>
+    <string name="camera_mode_video">Vídeo</string>
+    <string name="camera_mode_qr">Escaneja</string>
+    <string name="video_mirror_mode_off">Desactivat</string>
+    <string name="video_mirror_mode_on">Activat</string>
+    <string name="video_mirror_mode_on_ffc_only">Només la càmera frontal</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
new file mode 100644
index 00000000..bd1b3dda
--- /dev/null
+++ b/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2022-2023 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Fotoaparát</string>
+    <string name="video_camera_label">Kamera</string>
+    <string name="cancel_button_description">Zrušit</string>
+    <string name="confirm_button_description">Potvrdit</string>
+    <string name="flash_button_description">Režim blesku</string>
+    <string name="flip_camera_button_description">Překlopení stran</string>
+    <string name="gallery_button_description">Galerie</string>
+    <string name="google_lens_button_description">Otevřit Google Lens</string>
+    <string name="image_view_description">Náhled obrázku</string>
+    <string name="pro_button_description">Profesionální možnosti</string>
+    <string name="shutter_button_description">Závěrka</string>
+    <string name="video_recording_state_button_description">Pozastavit/pokračovat v nahrávání videa</string>
+    <string name="timer_off">ČASOVAČ VYPNUT</string>
+    <string name="timer_3">Časovač - 3s</string>
+    <string name="timer_10">Časovač - 10s</string>
+    <string name="video_framerate_auto">AUTOMATICKÉ FPS</string>
+    <string name="video_framerate_value"><xliff:g example="60" id="fps">%d</xliff:g> FPS</string>
+    <string name="effect_none">ŽÁDNÉ</string>
+    <string name="effect_night">NOC</string>
+    <string name="effect_face_retouch">ÚPRAVA OBLIČEJE</string>
+    <string name="effect_auto">AUTOMATICKY</string>
+    <string name="grid_off">BEZ MŘÍŽKY</string>
+    <string name="grid_on_3">MŘÍŽKA 3x3</string>
+    <string name="grid_on_4">MŘÍŽKA 4x4</string>
+    <string name="grid_on_goldenratio">MŘÍŽKA φ</string>
+    <string name="mic_off">VYPNOUT MIKROFON</string>
+    <string name="mic_on">ZAPNOUT MIKROFON</string>
+    <string name="settings">NASTAVENÍ</string>
+    <string name="app_permissions_toast">Uživatel neudělil oprávnění.</string>
+    <string name="camcorder_unsupported_toast">Žádná kamera nepodporuje nahrávání videa.</string>
+    <string name="qr_copy_description">Zkopírovat do schránky</string>
+    <string name="qr_icon_description">Ikona</string>
+    <string name="qr_share_description">Sdílet</string>
+    <string name="qr_wifi_title">Připojit k této Wi-Fi síti</string>
+    <string name="qr_dpp_description">Nastavit toto zařízení</string>
+    <string name="qr_text">Text</string>
+    <string name="title_activity_settings">Nastavení</string>
+    <string name="general_header">Obecné</string>
+    <string name="photos_header">Fotky</string>
+    <string name="video_header">Videa</string>
+    <string name="advanced_header">Pokročilé</string>
+    <string name="bright_screen_title">Plný jas obrazovky</string>
+    <string name="bright_screen_summary" formatted="false">Uzamkne jas na 100 %</string>
+    <string name="save_location_title">Uložit data o poloze</string>
+    <string name="save_location_summary">Zahrnout GPS polohu do metadat</string>
+    <string name="save_location_toast">Oprávnění pro polohu nejsou udělena uživatelem.</string>
+    <string name="shutter_sound_title">Zvuk závěrky</string>
+    <string name="shutter_sound_summary">Přehrát zvuk závěrky</string>
+    <string name="leveler_title">Umělý horizont</string>
+    <string name="leveler_summary">Indikátor orientace zařízení</string>
+    <string name="volume_buttons_action_title">Akce tlačítek hlasitosti</string>
+    <string name="photo_capture_mode_title">Režim snímání</string>
+    <string name="photo_capture_mode_maximize_quality">Maximalizovat kvalitu</string>
+    <string name="photo_capture_mode_minimize_latency">Minimalizovat latenci</string>
+    <string name="enable_zsl_title">Povolit ZSL, pokud je k dispozici</string>
+    <string name="enable_zsl_summary">Použijte režim nulového zpoždění závěrky, pokud jej fotoaparát podporuje. V tomto režimu jsou vypnuty fotografické efekty. Upozorňujeme, že tento režim je v současné době experimentální</string>
+    <string name="photo_ffc_mirror_title">Zrcadlit přední fotoaparát</string>
+    <string name="photo_ffc_mirror_summary">Uložit fotky z předního fotoaparátu tak, jak se zobrazují v náhledu</string>
+    <string name="video_stabilization_title">Povolit stabilizaci videa</string>
+    <string name="video_stabilization_summary">Povolte stabilizaci videa (pokud je k dispozici) pro snížení vibrací kamery při záznamu</string>
+    <string name="video_mirror_mode_title">Povolit zrcadlení videa</string>
+    <string name="processing_title">Zpracování</string>
+    <string name="processing_info">Při použití režimu ZSL v režimu fotografie se zohlední pouze výchozí a vypnuté hodnoty. U režimu videa budou brány v úvahu pouze výchozí, vypnuté a rychlé hodnoty.</string>
+    <string name="edge_mode_title">Zaostření</string>
+    <string name="edge_mode_summary">Vylepšení hran zlepšuje ostrost a detaily pořízeného snímku.</string>
+    <string name="edge_mode_default">Výchozí</string>
+    <string name="edge_mode_off">Vypnuto</string>
+    <string name="edge_mode_fast">Rychlé</string>
+    <string name="edge_mode_high_quality">Vysoká kvalita</string>
+    <string name="noise_reduction_mode_title">Odstranění šumu</string>
+    <string name="noise_reduction_mode_summary">Algoritmus redukce šumu se snaží zlepšit kvalitu snímku odstraněním nadměrného šumu vzniklého při snímání, zejména v tmavých podmínkách.</string>
+    <string name="noise_reduction_mode_default">Výchozí</string>
+    <string name="noise_reduction_mode_off">Vypnuto</string>
+    <string name="noise_reduction_mode_fast">Rychlé</string>
+    <string name="noise_reduction_mode_high_quality">Vysoká kvalita</string>
+    <string name="noise_reduction_mode_minimal">Minimální</string>
+    <string name="shading_mode_title">Korekce vinětace</string>
+    <string name="shading_mode_summary">Kvalita korekce vinětace objektivu aplikované na obrazová data.</string>
+    <string name="shading_mode_default">Výchozí</string>
+    <string name="shading_mode_off">Vypnuto</string>
+    <string name="shading_mode_fast">Rychlé</string>
+    <string name="shading_mode_high_quality">Vysoká kvalita</string>
+    <string name="color_correction_aberration_mode_title">Korekce barevné aberace</string>
+    <string name="color_correction_aberration_mode_summary">Chromatická (barevná) aberace je způsobena tím, že světlo různých vlnových délek se po výstupu z objektivu nemůže zaostřit na stejný bod.</string>
+    <string name="color_correction_aberration_mode_default">Výchozí</string>
+    <string name="color_correction_aberration_mode_off">Vypnuto</string>
+    <string name="color_correction_aberration_mode_fast">Rychlé</string>
+    <string name="color_correction_aberration_mode_high_quality">Vysoká kvalita</string>
+    <string name="distortion_correction_mode_title">Korekce zkreslení</string>
+    <string name="distortion_correction_mode_summary">Režim činnosti bloku korekce zkreslení objektivu.</string>
+    <string name="distortion_correction_mode_default">Výchozí</string>
+    <string name="distortion_correction_mode_off">Vypnuto</string>
+    <string name="distortion_correction_mode_fast">Rychlé</string>
+    <string name="distortion_correction_mode_high_quality">Vysoká kvalita</string>
+    <string name="hot_pixel_mode_title">Korekce hot-pixelů</string>
+    <string name="hot_pixel_mode_summary">Korekce hot-pixelů interpoluje nebo jinak odstraňuje pixely, které neměří přesně dopadající světlo (tj. pixely, které jsou zaseknuté na libovolné hodnotě nebo jsou přecitlivělé).</string>
+    <string name="hot_pixel_mode_default">Výchozí</string>
+    <string name="hot_pixel_mode_off">Vypnuto</string>
+    <string name="hot_pixel_mode_fast">Rychlé</string>
+    <string name="hot_pixel_mode_high_quality">Vysoká kvalita</string>
+    <string name="shortcut_selfie">Pořídit selfie</string>
+    <string name="shortcut_video">Pořídit video</string>
+    <string name="shortcut_qr">Skenovat čárový kód</string>
+    <string name="location_permission_dialog_title">Přidat polohu fotografií a videí</string>
+    <string name="location_permission_dialog_description">Mapujte své vzpomínky zahrnutím metadat o poloze s každým zachycením</string>
+    <string name="location_permission_dialog_later">Později</string>
+    <string name="location_permission_dialog_turn_on">Zapnout</string>
+    <string name="error_max_cameras_in_use">Bylo dosaženo maximálního počtu otevřených fotoaparátů, zkuste zavřít jiné aplikace používající fotoaparáty zařízení.</string>
+    <string name="error_camera_in_use">Tento fotoaparát je již používán, zkuste zavřít aplikaci, která jej používá.</string>
+    <string name="error_stream_config">Došlo k chybě při přípravě datového toku. Prosím, nahlaste tuto chybu vývojářům.</string>
+    <string name="error_other_recoverable_error">Chyba při nastavování relace. Aplikace se pokusí obnovit.</string>
+    <string name="error_camera_disabled">Kamera je zakázána. To může být způsobeno pravidly zařízení.</string>
+    <string name="error_camera_fatal_error">Došlo k fatální chybě. Zkuste zařízení restartovat.</string>
+    <string name="error_do_not_disturb_mode_enabled">Režim Nerušit je povolen. Vypněte jej a znovu otevřete aplikaci.</string>
+    <string name="error_unknown_recoverable">Byla nalezena neznámá chyba, kterou lze obnovit. Nahlaste ji prosím vývojářům.</string>
+    <string name="error_unknown_critical">Byla nalezena neznámá kritická chyba. Nahlaste ji prosím vývojářům.</string>
+    <string name="gesture_action_shutter">Závěrka</string>
+    <string name="gesture_action_zoom">Přiblížení</string>
+    <string name="gesture_action_volume">Hlasitost</string>
+    <string name="gesture_action_nothing">Žádná akce</string>
+    <string name="thermal_status_moderate">Mírné tepelné omezení, ujistěte se, že zařízení není na přímém slunečním světle.</string>
+    <string name="thermal_status_severe">Silné tepelné omezení, doporučuje se nechat zařízení trochu vychladnout.</string>
+    <string name="thermal_status_critical">Kritické teplotní omezení, aplikace by mohla být brzy uzavřena.</string>
+    <string name="thermal_status_emergency">Nouzové teplotní omezení, aplikace se nyní ukončí.</string>
+    <string name="thermal_status_shutdown">Vypnutí tepelného omezení, zařízení se vypne.</string>
+    <string name="force_torch_help">V režimu fotoaparátu můžete dlouze stisknout tlačítko blesku pro přepnutí do režimu svítilny.</string>
+    <string name="camera_mode_photo">Fotografie</string>
+    <string name="camera_mode_video">Video</string>
+    <string name="camera_mode_qr">Skenovat</string>
+    <string name="video_mirror_mode_off">Vypnuto</string>
+    <string name="video_mirror_mode_on">Zapnuto</string>
+    <string name="video_mirror_mode_on_ffc_only">Pouze přední fotoaparát</string>
+</resources>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 3ae2de8d..d77e3340 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -44,6 +44,7 @@
     <string name="general_header">Cyffredinol</string>
     <string name="photos_header">Lluniau</string>
     <string name="video_header">Fideo</string>
+    <string name="advanced_header">Uwch</string>
     <string name="bright_screen_title">Sgrin ddisglair</string>
     <string name="bright_screen_summary" formatted="false">Mae\'n cloi\'r disgleirdeb i 100%</string>
     <string name="save_location_title">Cadw data lleoliad</string>
@@ -56,6 +57,16 @@
     <string name="photo_capture_mode_title">Modd cipio</string>
     <string name="photo_capture_mode_maximize_quality">Ansawdd gorau</string>
     <string name="photo_capture_mode_minimize_latency">Cuddni lleiaf</string>
+    <string name="processing_title">Prosesu</string>
+    <string name="edge_mode_default">Rhagosodedig</string>
+    <string name="edge_mode_off">I ffwrdd</string>
+    <string name="edge_mode_fast">Cyflym</string>
+    <string name="edge_mode_high_quality">Ansawdd uchel</string>
+    <string name="noise_reduction_mode_off">I ffwrdd</string>
+    <string name="shading_mode_off">I ffwrdd</string>
+    <string name="color_correction_aberration_mode_off">I ffwrdd</string>
+    <string name="distortion_correction_mode_off">I ffwrdd</string>
+    <string name="hot_pixel_mode_off">I ffwrdd</string>
     <string name="shortcut_selfie">Tynnu hunlun</string>
     <string name="shortcut_video">Tynnu fideo</string>
     <string name="shortcut_qr">Sganoi cod bar</string>
@@ -63,4 +74,6 @@
     <string name="location_permission_dialog_description">Mapia dy atgofion gan gynnwyd metaddata lleoliad gyda phob ffeil.</string>
     <string name="location_permission_dialog_later">Yn hwyrach</string>
     <string name="location_permission_dialog_turn_on">Troi ymlaen</string>
+    <string name="video_mirror_mode_off">I ffwrdd</string>
+    <string name="video_mirror_mode_on">Ymlaen</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 71bdc6a8..549459b7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -44,6 +44,7 @@
     <string name="general_header">Allgemein</string>
     <string name="photos_header">Fotos</string>
     <string name="video_header">Video</string>
+    <string name="advanced_header">Erweitert</string>
     <string name="bright_screen_title">Max. Bildschirmhelligkeit</string>
     <string name="bright_screen_summary" formatted="false">Helligkeit auf 100% festlegen</string>
     <string name="save_location_title">Standortdaten speichern</string>
@@ -53,6 +54,7 @@
     <string name="shutter_sound_summary">Bei Bildaufnahme einen Ton abspielen</string>
     <string name="leveler_title">Wasserwaage</string>
     <string name="leveler_summary">Anzeige für horizontale Ausrichtung des Geräts</string>
+    <string name="volume_buttons_action_title">Aktion für Lautstärketasten</string>
     <string name="photo_capture_mode_title">Aufnahmemodus</string>
     <string name="photo_capture_mode_maximize_quality">Maximale Qualität</string>
     <string name="photo_capture_mode_minimize_latency">Minimale Verzögerung</string>
@@ -62,6 +64,37 @@
     <string name="photo_ffc_mirror_summary">Frontkamerafotos so speichern, wie sie in der Vorschau erscheinen</string>
     <string name="video_stabilization_title">Videostabilisierung aktivieren</string>
     <string name="video_stabilization_summary">Wenn möglich, die Videostabilisierung aktivieren, um Kameravibrationen während der Aufnahme zu reduzieren</string>
+    <string name="video_mirror_mode_title">Videospiegelung aktivieren</string>
+    <string name="processing_info">Im Fotomodus werden bei Verwendung des ZSL-Modus nur die Werte Standard und Aus berücksichtigt. Im Videomodus werden nur die Werte Standard, Aus und Schnell berücksichtigt.</string>
+    <string name="edge_mode_title">Schärfen</string>
+    <string name="edge_mode_default">Standard</string>
+    <string name="edge_mode_off">Aus</string>
+    <string name="edge_mode_fast">Schnell</string>
+    <string name="edge_mode_high_quality">Hohe Qualität</string>
+    <string name="noise_reduction_mode_title">Entrauschen</string>
+    <string name="noise_reduction_mode_default">Standard</string>
+    <string name="noise_reduction_mode_off">Aus</string>
+    <string name="noise_reduction_mode_fast">Schnell</string>
+    <string name="noise_reduction_mode_high_quality">Hohe Qualität</string>
+    <string name="noise_reduction_mode_minimal">Minimal</string>
+    <string name="shading_mode_title">Korrektur der Vignettierung</string>
+    <string name="shading_mode_summary">Qualität der auf die Bilddaten angewandten Korrektur der Objektivabschattung.</string>
+    <string name="shading_mode_default">Standard</string>
+    <string name="shading_mode_off">Aus</string>
+    <string name="shading_mode_fast">Schnell</string>
+    <string name="shading_mode_high_quality">Hohe Qualität</string>
+    <string name="color_correction_aberration_mode_default">Standard</string>
+    <string name="color_correction_aberration_mode_off">Aus</string>
+    <string name="color_correction_aberration_mode_fast">Schnell</string>
+    <string name="color_correction_aberration_mode_high_quality">Hohe Qualität</string>
+    <string name="distortion_correction_mode_default">Standard</string>
+    <string name="distortion_correction_mode_off">Aus</string>
+    <string name="distortion_correction_mode_fast">Schnell</string>
+    <string name="distortion_correction_mode_high_quality">Hohe Qualität</string>
+    <string name="hot_pixel_mode_default">Standard</string>
+    <string name="hot_pixel_mode_off">Aus</string>
+    <string name="hot_pixel_mode_fast">Schnell</string>
+    <string name="hot_pixel_mode_high_quality">Hohe Qualität</string>
     <string name="shortcut_selfie">Selfie aufnehmen</string>
     <string name="shortcut_video">Video aufnehmen</string>
     <string name="shortcut_qr">Barcode scannen</string>
@@ -69,4 +102,22 @@
     <string name="location_permission_dialog_description">Füge jeder Aufnahme Standort-Metadaten hinzu, um deine Erinnerungen zuzuordnen.</string>
     <string name="location_permission_dialog_later">Später</string>
     <string name="location_permission_dialog_turn_on">Einschalten</string>
+    <string name="error_max_cameras_in_use">Die maximale Anzahl der geöffneten Kameras wurde erreicht. Versuche andere Apps zu schließen, die die Kameras des Geräts verwenden.</string>
+    <string name="error_camera_in_use">Diese Kamera wird bereits verwendet. Versuche, die App zu schließen, die sie verwendet.</string>
+    <string name="error_stream_config">Es ist ein Fehler bei der Vorbereitung des Streams aufgetreten. Bitte melde dies den Entwicklern.</string>
+    <string name="error_other_recoverable_error">Fehler beim Einrichten der Session. Die App wird versuchen, den Fehler zu beheben.</string>
+    <string name="error_camera_disabled">Die Kamera ist deaktiviert. Dies kann durch die Geräterichtlinie verursacht werden.</string>
+    <string name="error_camera_fatal_error">Es ist ein schwerwiegender Fehler aufgetreten. Versuche, dein Gerät neu zu starten.</string>
+    <string name="error_do_not_disturb_mode_enabled">Der Modus \"Bitte nicht stören\" ist aktiviert. Deaktiviere ihn und öffne die App erneut.</string>
+    <string name="gesture_action_shutter">Auslöser</string>
+    <string name="gesture_action_zoom">Zoom</string>
+    <string name="gesture_action_volume">Lautstärke</string>
+    <string name="gesture_action_nothing">Keine Aktion</string>
+    <string name="force_torch_help">Im Fotomodus kannst du die Blitztaste lange drücken, um in den Taschenlampenmodus zu wechseln.</string>
+    <string name="camera_mode_photo">Foto</string>
+    <string name="camera_mode_video">Video</string>
+    <string name="camera_mode_qr">Scannen</string>
+    <string name="video_mirror_mode_off">Aus</string>
+    <string name="video_mirror_mode_on">An</string>
+    <string name="video_mirror_mode_on_ffc_only">Nur Frontkamera</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ce72e271..b05aeeca 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -129,4 +129,7 @@
     <string name="thermal_status_emergency">Θερμικός περιορισμός έκτακτης ανάγκης, η εφαρμογή θα κλείσει τώρα.</string>
     <string name="thermal_status_shutdown">Σοβαρός θερμικός περιορισμός, η συσκευή θα απενεργοποιηθεί.</string>
     <string name="force_torch_help">Στη λειτουργία φωτογραφίας, μπορείτε να πιέσετε παρατεταμένα το κουμπί φλας για να μεταβείτε σε λειτουργία φακού.</string>
+    <string name="camera_mode_photo">Φώτο</string>
+    <string name="camera_mode_video">Βίντεο</string>
+    <string name="camera_mode_qr">Σάρωση</string>
 </resources>
diff --git a/app/src/main/res/values-en-rAU/strings.xml b/app/src/main/res/values-en-rAU/strings.xml
index d712c4af..a03c5a45 100644
--- a/app/src/main/res/values-en-rAU/strings.xml
+++ b/app/src/main/res/values-en-rAU/strings.xml
@@ -129,4 +129,7 @@
     <string name="thermal_status_emergency">Emergency thermal throttling, the app will close now.</string>
     <string name="thermal_status_shutdown">Shutdown thermal throttling, the device will power off.</string>
     <string name="force_torch_help">In photo mode, you can long press the flash button to switch into torch mode.</string>
+    <string name="camera_mode_photo">Photo</string>
+    <string name="camera_mode_video">Video</string>
+    <string name="camera_mode_qr">Scan</string>
 </resources>
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
index b4e93283..f541afc1 100644
--- a/app/src/main/res/values-en-rCA/strings.xml
+++ b/app/src/main/res/values-en-rCA/strings.xml
@@ -129,4 +129,7 @@
     <string name="thermal_status_emergency">Emergency thermal throttling, the app will close now.</string>
     <string name="thermal_status_shutdown">Shutdown thermal throttling, the device will power off.</string>
     <string name="force_torch_help">In photo mode, you can long press the flash button to switch into torch mode.</string>
+    <string name="camera_mode_photo">Photo</string>
+    <string name="camera_mode_video">Video</string>
+    <string name="camera_mode_qr">Scan</string>
 </resources>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index d712c4af..a03c5a45 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -129,4 +129,7 @@
     <string name="thermal_status_emergency">Emergency thermal throttling, the app will close now.</string>
     <string name="thermal_status_shutdown">Shutdown thermal throttling, the device will power off.</string>
     <string name="force_torch_help">In photo mode, you can long press the flash button to switch into torch mode.</string>
+    <string name="camera_mode_photo">Photo</string>
+    <string name="camera_mode_video">Video</string>
+    <string name="camera_mode_qr">Scan</string>
 </resources>
diff --git a/app/src/main/res/values-en-rIN/strings.xml b/app/src/main/res/values-en-rIN/strings.xml
index d712c4af..a03c5a45 100644
--- a/app/src/main/res/values-en-rIN/strings.xml
+++ b/app/src/main/res/values-en-rIN/strings.xml
@@ -129,4 +129,7 @@
     <string name="thermal_status_emergency">Emergency thermal throttling, the app will close now.</string>
     <string name="thermal_status_shutdown">Shutdown thermal throttling, the device will power off.</string>
     <string name="force_torch_help">In photo mode, you can long press the flash button to switch into torch mode.</string>
+    <string name="camera_mode_photo">Photo</string>
+    <string name="camera_mode_video">Video</string>
+    <string name="camera_mode_qr">Scan</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 969c8272..3c6ca4b5 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -5,6 +5,8 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="photo_ffc_mirror_title">Peilaa etukamera</string>
+    <string name="photo_ffc_mirror_summary">Tallenna etukameran kuvat kuten ne näkyvät esikatselussa.</string>
+    <string name="video_mirror_mode_title">Käytä videon peilausta</string>
     <string name="edge_mode_title">Terävöitys</string>
     <string name="edge_mode_summary">Reunojen parannus terävöittää ja tarkentaa kaapatun kuvan yksityiskohtia.</string>
     <string name="edge_mode_default">Oletus</string>
@@ -32,4 +34,5 @@
     <string name="hot_pixel_mode_off">Ei käytössä</string>
     <string name="hot_pixel_mode_fast">Nopea</string>
     <string name="hot_pixel_mode_high_quality">Korkealaatuinen</string>
+    <string name="video_mirror_mode_on_ffc_only">Vain etukamera</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7eb689c9..38b10745 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -131,4 +131,6 @@
     <string name="force_torch_help">En mode photo, vous pouvez appuyer longuement sur le bouton flash pour basculer sur la lampe torche.</string>
     <string name="camera_mode_photo">Photo</string>
     <string name="camera_mode_video">Vidéo</string>
+    <string name="camera_mode_qr">Scanner</string>
+    <string name="video_mirror_mode_on_ffc_only">Caméra frontale uniquement</string>
 </resources>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 7b6a0e89..c02e603f 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -58,6 +58,8 @@
     <string name="enable_zsl_summary">Notaðu tafarlausa myndatöku (Zero-Shutter Lag - ZSL) þegar myndavélin styður slíkt. Sjónbrellur á myndir eru ekki virkar í þessum ham. Athugaðu að þetta er eiginleiki á tilraunastigi</string>
     <string name="photo_ffc_mirror_title">Spegla frammyndavél</string>
     <string name="video_stabilization_title">Virkja stöðugleikajöfnun myndmerkis</string>
+    <string name="color_correction_aberration_mode_title">Litskekkjuleiðrétting</string>
+    <string name="distortion_correction_mode_title">Leiðrétting linsuskekkingar</string>
     <string name="shortcut_selfie">Taka sjálfsmynd</string>
     <string name="shortcut_video">Taka myndskeið</string>
     <string name="shortcut_qr">Skanna strikamerki</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 46300f53..d2bd7166 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">Salva le foto della fotocamera frontale come appaiono nell\'anteprima</string>
     <string name="video_stabilization_title">Abilita la stabilizzazione dei video</string>
     <string name="video_stabilization_summary">Se disponibile, abilita la stabilizzazione dei video per ridurre le vibrazioni della fotocamera durante la registrazione</string>
+    <string name="video_mirror_mode_title">Abilita la riflessione del video</string>
     <string name="processing_title">Elaborazione delle immagini</string>
     <string name="processing_info">In modalità foto, quando viene utilizzata la modalità ZSL, saranno presi in considerazione solo i valori \"Predefinito\" e \"Disattivato\". In modalità video, saranno presi in considerazione i valori \"Predefinito\", \"Disattivato\" e \"Veloce\".</string>
     <string name="edge_mode_title">Nitidezza</string>
@@ -132,4 +133,7 @@
     <string name="camera_mode_photo">Foto</string>
     <string name="camera_mode_video">Video</string>
     <string name="camera_mode_qr">Scansione</string>
+    <string name="video_mirror_mode_off">Disattivata</string>
+    <string name="video_mirror_mode_on">Attiva</string>
+    <string name="video_mirror_mode_on_ffc_only">Solo fotocamera frontale</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 18e83001..0f1dddd3 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -53,6 +53,7 @@
     <string name="photo_ffc_mirror_summary">フロントカメラの写真をプレビュー表示と同じ向きで保存します</string>
     <string name="video_stabilization_title">動画の安定化を有効にする</string>
     <string name="video_stabilization_summary">利用可能な場合、録画中にカメラの手ぶれを減らすためにビデオの安定化を有効化します</string>
+    <string name="video_mirror_mode_title">ビデオミラーリングを有効化</string>
     <string name="processing_title">処理中</string>
     <string name="processing_info">フォトモードでは、ZSLモードを使用する場合デフォルトとオフ値のみが考慮されます。 ビデオモードの場合、デフォルト、オフと高速の値のみが考慮されます。</string>
     <string name="edge_mode_title">シャープニング</string>
@@ -114,4 +115,7 @@
     <string name="camera_mode_photo">写真</string>
     <string name="camera_mode_video">動画</string>
     <string name="camera_mode_qr">スキャン</string>
+    <string name="video_mirror_mode_off">OFF</string>
+    <string name="video_mirror_mode_on">ON</string>
+    <string name="video_mirror_mode_on_ffc_only">フロントカメラのみ</string>
 </resources>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index d601b80b..468e8a9f 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">წინა კამერით გადაღებულის შენახვა ისე, როგორც შეთვალიერებისას ჩანს</string>
     <string name="video_stabilization_title">ვიდეოგადაღებისას რყევის შემცირება</string>
     <string name="video_stabilization_summary">როცა კი შესაძლებელია, რყევის შემამცირებელი შთანთქავს კამერის მოძრაობას გადაღებისას</string>
+    <string name="video_mirror_mode_title">ვიდეოგადაღება სარკისებურად</string>
     <string name="processing_title">მუშავდება</string>
     <string name="processing_info">ფოტოგადაღებისას, როცა გამოიყენება ZSL, გათვალისწინებული იქნება მხოლოდ „ნაგულისხმევი“ და „გამორთული“ მნიშვნელობები. ვიდეოგადაღებისას კი მხოლოდ „ნაგულისხმევი“, „გამორთული“ და „სწრაფი“.</string>
     <string name="edge_mode_title">გამკვეთრება</string>
@@ -132,4 +133,7 @@
     <string name="camera_mode_photo">ფოტო</string>
     <string name="camera_mode_video">ვიდეო</string>
     <string name="camera_mode_qr">სკანერი</string>
+    <string name="video_mirror_mode_off">გამორთ.</string>
+    <string name="video_mirror_mode_on">ჩართ.</string>
+    <string name="video_mirror_mode_on_ffc_only">მხოლოდ წინა კამერაზე</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f42cd036..7cff2661 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -23,14 +23,17 @@
     <string name="video_framerate_value"><xliff:g example="60" id="fps">%d</xliff:g> FPS</string>
     <string name="effect_none">GEEN</string>
     <string name="effect_night">NACHT</string>
+    <string name="effect_face_retouch">GEZICHT RETOUCH</string>
     <string name="effect_auto">AUTOMATISCH</string>
     <string name="grid_off">RASTER UIT</string>
     <string name="grid_on_3">GRID 3x3</string>
     <string name="grid_on_4">GRID 4x4</string>
+    <string name="grid_on_goldenratio">ROOSTER φ</string>
     <string name="mic_off">MIC UIT</string>
     <string name="mic_on">MIC AAN</string>
     <string name="settings">INSTELLINGEN</string>
     <string name="app_permissions_toast">Machtigingen niet toegekend door de gebruiker.</string>
+    <string name="camcorder_unsupported_toast">Geen camera ondersteunt video-opname.</string>
     <string name="qr_copy_description">Kopieer naar klembord</string>
     <string name="qr_icon_description">Pictogram</string>
     <string name="qr_share_description">Deel</string>
@@ -55,10 +58,13 @@
     <string name="photo_capture_mode_title">Opnamemodus</string>
     <string name="photo_capture_mode_maximize_quality">Kwaliteit maximaliseren</string>
     <string name="photo_capture_mode_minimize_latency">Minimaliseer latentie</string>
+    <string name="enable_zsl_title">Schakel ZSL in indien beschikbaar</string>
+    <string name="enable_zsl_summary">Zero-Shutter Lag gebruiken als de camera het ondersteunt. In deze modus zijn foto-effecten uitgeschakeld. Let op dat deze modus momenteel experimenteel is</string>
     <string name="photo_ffc_mirror_title">Camera aan de voorzijde spiegelen</string>
     <string name="photo_ffc_mirror_summary">Sla foto\'s van de voorste camera op zoals ze worden weergegeven in het voorbeeld</string>
     <string name="video_stabilization_title">Schakel videostabilisatie in</string>
     <string name="video_stabilization_summary">Schakel videostabilisatie in, indien beschikbaar, om camera-trillingen te verminderen tijdens opname</string>
+    <string name="video_mirror_mode_title">Schakel video spiegeling in</string>
     <string name="processing_title">Wordt verwerkt</string>
     <string name="processing_info">In de foto-modus, wanneer ZSL-modus wordt gebruikt, worden alleen standaard- en uit-waarden in aanmerking genomen. Voor de videomodus worden alleen default, off en snelle waarden in aanmerking genomen.</string>
     <string name="edge_mode_title">Verscherpen</string>
@@ -127,4 +133,7 @@
     <string name="camera_mode_photo">Foto</string>
     <string name="camera_mode_video">Video</string>
     <string name="camera_mode_qr">Scannen</string>
+    <string name="video_mirror_mode_off">Uit</string>
+    <string name="video_mirror_mode_on">Aan</string>
+    <string name="video_mirror_mode_on_ffc_only">Alleen camera aan de voorkant</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3951ec24..7d7109cf 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">Zapisywanie zdjęć z przedniego aparatu tak, jak są widoczne na podglądzie</string>
     <string name="video_stabilization_title">Włącz stabilizację wideo</string>
     <string name="video_stabilization_summary">Jeżeli możliwe, włącz stabilizację wideo, aby zredukować drgania kamery podczas nagrywania</string>
+    <string name="video_mirror_mode_title">Włącz lustrzane odbicie wideo</string>
     <string name="processing_title">Przetwarzanie</string>
     <string name="processing_info">W trybie zdjęcia, gdy używany jest tryb ZSL, brane są pod uwagę tylko wartości domyślne i wyłączone. W trybie wideo brane są pod uwagę tylko wartości domyślne, wyłączone i szybkie.</string>
     <string name="edge_mode_title">Wyostrzanie</string>
@@ -132,4 +133,7 @@
     <string name="camera_mode_photo">Zdjęcie</string>
     <string name="camera_mode_video">Wideo</string>
     <string name="camera_mode_qr">Skaner</string>
+    <string name="video_mirror_mode_off">Wyłączono</string>
+    <string name="video_mirror_mode_on">Włączono</string>
+    <string name="video_mirror_mode_on_ffc_only">Tylko przedni aparat</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index a887836c..bb947cb9 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">Salvează fotografiile camerei frontale așa cum apar ele în previzualizare</string>
     <string name="video_stabilization_title">Activează stabilizarea video</string>
     <string name="video_stabilization_summary">Atunci când este disponibilă, activează stabilizarea video pentru a reduce vibrațiile camerei în timpul înregistrării</string>
+    <string name="video_mirror_mode_title">Activare oglindire video</string>
     <string name="processing_title">Procesare</string>
     <string name="processing_info">În modul fotografie, atunci când modul ZSL este utilizat, vor fi luate în considerare doar valorile implicite şi off. Pentru modul video, vor fi luate în considerare numai valorile implicite, off și rapid.</string>
     <string name="edge_mode_title">Sharpening</string>
@@ -132,4 +133,7 @@
     <string name="camera_mode_photo">Foto</string>
     <string name="camera_mode_video">Video</string>
     <string name="camera_mode_qr">Scanare</string>
+    <string name="video_mirror_mode_off">Oprit</string>
+    <string name="video_mirror_mode_on">Pornit</string>
+    <string name="video_mirror_mode_on_ffc_only">Doar camera frontală</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3c01f949..1ff2c659 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">Сохранять фото с фронтальной камеры в том виде, в котором они отображаются при предварительном просмотре</string>
     <string name="video_stabilization_title">Включить стабилизацию видео</string>
     <string name="video_stabilization_summary">Включить стабилизацию видео для уменьшения вибрации камеры во время записи (если доступно)</string>
+    <string name="video_mirror_mode_title">Зеркалирование видео</string>
     <string name="processing_title">Обработка</string>
     <string name="processing_info">В режиме фото, при использовании режима ZSL, учитываются только значения по умолчанию и выключено. Для режима видео учитываются только значения по умолчанию, выключено и быстро.</string>
     <string name="edge_mode_title">Резкость</string>
@@ -132,4 +133,7 @@
     <string name="camera_mode_photo">Фото</string>
     <string name="camera_mode_video">Видео</string>
     <string name="camera_mode_qr">Сканер</string>
+    <string name="video_mirror_mode_off">Выкл</string>
+    <string name="video_mirror_mode_on">Вкл</string>
+    <string name="video_mirror_mode_on_ffc_only">Только для фронтальной камеры</string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index e94a9e84..2060789a 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">Shrani fotografije sprednjega fotoaparata, kot se prikažejo na predogledu</string>
     <string name="video_stabilization_title">Omogoči stabilizacijo videa</string>
     <string name="video_stabilization_summary">Ko je na voljo, omogoči stabilizacijo videa za zmanjšanje vibracij fotoaparata med snemanjem</string>
+    <string name="video_mirror_mode_title">Omogoči zrcaljenje videoposnetka</string>
     <string name="processing_title">Obdelovanje</string>
     <string name="processing_info">V načinu fotografiranja, ko je uporabljen način ZSL, bodo upoštevane samo privzete in izklopljene vrednosti. Za način videoposnetka bodo upoštevane samo privzete, izklopljene in hitre vrednosti.</string>
     <string name="edge_mode_title">Ostrenje</string>
@@ -129,7 +130,10 @@
     <string name="thermal_status_emergency">Nujno termalno dušenje, aplikacija se bo zdaj zaprla.</string>
     <string name="thermal_status_shutdown">Zaustavitveno termalno dušenje, naprava se bo izklopila.</string>
     <string name="force_torch_help">V načinu fotografiranja, lahko pridržite gumb bliskavice za preklop na način svetilke.</string>
-    <string name="camera_mode_photo">Fotografija</string>
-    <string name="camera_mode_video">Videoposnetek</string>
+    <string name="camera_mode_photo">Foto</string>
+    <string name="camera_mode_video">Video</string>
     <string name="camera_mode_qr">Branje</string>
+    <string name="video_mirror_mode_off">Izklopljeno</string>
+    <string name="video_mirror_mode_on">Vklopljeno</string>
+    <string name="video_mirror_mode_on_ffc_only">Samo sprednji fotoaparat</string>
 </resources>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 80a9ab6c..5b114fd8 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">Ruani fotot e kamerës së përparme siç shfaqen në pamjen paraprake</string>
     <string name="video_stabilization_title">Aktivizo stabilizimin e videos</string>
     <string name="video_stabilization_summary">Kur disponohet, aktivizoni stabilizimin e videos për të reduktuar dridhjet e kamerës gjatë regjistrimit</string>
+    <string name="video_mirror_mode_title">Aktivizo pasqyrimin e videos</string>
     <string name="processing_title">Përpunim</string>
     <string name="processing_info">Në modalitetin e fotografisë, kur përdoret modaliteti ZSL, do të merren parasysh vetëm vlerat e paracaktuara dhe të çaktivizuara.  Për modalitetin e videos, do të merren parasysh vetëm vlerat e paracaktuara, të çaktivizuara dhe të shpejta.</string>
     <string name="edge_mode_title">Mprehje</string>
@@ -132,4 +133,7 @@
     <string name="camera_mode_photo">Foto</string>
     <string name="camera_mode_video">Video</string>
     <string name="camera_mode_qr">Skano</string>
+    <string name="video_mirror_mode_off">Fikur</string>
+    <string name="video_mirror_mode_on">Ndezur</string>
+    <string name="video_mirror_mode_on_ffc_only">Vetëm kamera e përparme</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 335fead7..d66185b8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">保存预览中显示的前置摄像头照片</string>
     <string name="video_stabilization_title">启用视频防抖</string>
     <string name="video_stabilization_summary">如果可用，启用视频防抖以减少录制时的抖动</string>
+    <string name="video_mirror_mode_title">启用视频镜像</string>
     <string name="processing_title">处理中</string>
     <string name="processing_info">在照片模式下，当使用 ZSL 模式时，仅考虑默认和关闭。  对于视频模式，仅考虑默认、关闭和快速。</string>
     <string name="edge_mode_title">锐化</string>
@@ -132,4 +133,7 @@
     <string name="camera_mode_photo">照片</string>
     <string name="camera_mode_video">视频</string>
     <string name="camera_mode_qr">扫描</string>
+    <string name="video_mirror_mode_off">关</string>
+    <string name="video_mirror_mode_on">开</string>
+    <string name="video_mirror_mode_on_ffc_only">仅前置摄像头</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e9825b4d..7b11e961 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -64,6 +64,7 @@
     <string name="photo_ffc_mirror_summary">儲存預覽中顯示的前置鏡頭相片</string>
     <string name="video_stabilization_title">啟用影片防震</string>
     <string name="video_stabilization_summary">在可用時啟用影片防震以減少錄影時的相機震動</string>
+    <string name="video_mirror_mode_title">啟用視訊鏡像</string>
     <string name="processing_title">處理中</string>
     <string name="processing_info">在相片模式中，使用 ZSL 模式時，將僅考量預設值和關閉值。對於影片模式，將僅考量預設值、關閉值和快速值。</string>
     <string name="edge_mode_title">銳利化</string>
@@ -132,4 +133,7 @@
     <string name="camera_mode_photo">相片</string>
     <string name="camera_mode_video">影片</string>
     <string name="camera_mode_qr">掃描</string>
+    <string name="video_mirror_mode_off">關閉</string>
+    <string name="video_mirror_mode_on">開啟</string>
+    <string name="video_mirror_mode_on_ffc_only">僅前鏡頭</string>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 4414ff9d..5482b61e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -121,4 +121,17 @@
         <item>fast</item>
         <item>high_quality</item>
     </string-array>
+
+    <!-- Video mirror mode preference -->
+    <string-array name="video_mirror_mode_entries" translatable="false">
+        <item>@string/video_mirror_mode_off</item>
+        <item>@string/video_mirror_mode_on</item>
+        <item>@string/video_mirror_mode_on_ffc_only</item>
+    </string-array>
+
+    <string-array name="video_mirror_mode_values" translatable="false">
+        <item>off</item>
+        <item>on</item>
+        <item>on_ffc_only</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index 3fe8772e..39d96980 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -46,9 +46,11 @@
           - "30"
           - "60"
           - "120"
+         Additionally you can prepend `-` to frame rate to mark it as unsupported.
          Example:
              <string-array name="config_additionalVideoConfigurations">
                  <item>0</item> <item>sd|hd|fhd</item> <item>60|120</item>
+                 <item>0</item> <item>uhd</item> <item>-60</item>
                  <item>1</item> <item>sd|hd|fhd</item> <item>60</item>
              </string-array>
     -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b5c5c5b..ca98ce5f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,6 +99,7 @@
     <!-- Video Preferences -->
     <string name="video_stabilization_title">Enable video stabilization</string>
     <string name="video_stabilization_summary">When available, enable video stabilization to reduce camera vibrations during recording</string>
+    <string name="video_mirror_mode_title">Enable video mirroring</string>
 
     <!-- Advanced Preferences -->
     <string name="processing_title">Processing</string>
@@ -185,4 +186,17 @@
     <string name="camera_mode_photo">Photo</string>
     <string name="camera_mode_video">Video</string>
     <string name="camera_mode_qr">Scan</string>
+
+    <!-- Video dynamic ranges -->
+    <string name="video_dynamic_range_sdr" translatable="false">SDR</string>
+    <string name="video_dynamic_range_hlg_10_bit" translatable="false">HLG (10 bit)</string>
+    <string name="video_dynamic_range_hdr10_10_bit" translatable="false">HDR10 (10 bit)</string>
+    <string name="video_dynamic_range_hdr10_plus_10_bit" translatable="false">HDR10+ (10 bit)</string>
+    <string name="video_dynamic_range_dolby_vision_10_bit" translatable="false">Dolby Vision (10 bit)</string>
+    <string name="video_dynamic_range_dolby_vision_8_bit" translatable="false">Dolby Vision (8 bit)</string>
+
+    <!-- Video mirror mode -->
+    <string name="video_mirror_mode_off">Off</string>
+    <string name="video_mirror_mode_on">On</string>
+    <string name="video_mirror_mode_on_ffc_only">Front facing camera only</string>
 </resources>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index b83869ce..3dea1b84 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -88,6 +88,15 @@
             app:summary="@string/video_stabilization_summary"
             app:title="@string/video_stabilization_title" />
 
+        <ListPreference
+            app:defaultValue="off"
+            app:entries="@array/video_mirror_mode_entries"
+            app:entryValues="@array/video_mirror_mode_values"
+            app:iconSpaceReserved="false"
+            app:key="video_mirror_mode"
+            app:title="@string/video_mirror_mode_title"
+            app:useSimpleSummaryProvider="true" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/build.gradle.kts b/build.gradle.kts
index 35b7e49a..24be244e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,11 +5,11 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "7.4.2" apply false
-    id("com.android.library") version "7.4.2" apply false
+    id("com.android.application") version "8.1.2" apply false
+    id("com.android.library") version "8.1.2" apply false
     id("org.jetbrains.kotlin.android") version "1.7.10" apply false
 }
 
 tasks.register<Delete>("clean").configure {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
diff --git a/gradle.properties b/gradle.properties
index 8c38e4ea..a9ea0890 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,7 +20,3 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c0..7f93135c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 97e75458..ac72c34e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Jan 25 19:59:24 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c..0adc8e1a 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f9..6689b85b 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/lens_launcher/build.gradle.kts b/lens_launcher/build.gradle.kts
index d5320665..84430b52 100644
--- a/lens_launcher/build.gradle.kts
+++ b/lens_launcher/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
 
 android {
     compileSdk = 33
+    namespace = "com.google.android.apps.googlecamera.fishfood"
 
     defaultConfig {
         applicationId = "com.google.android.apps.googlecamera.fishfood"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 451590ab..36dfa35b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/54901603849cb157716f4ff65bb85ab0538c30e7/.m2")
+        maven("https://raw.githubusercontent.com/lineage-next/camerax-aperture/2ac992438b7c5eb3783b79007d0dee2cd044e893/.m2")
         google()
         mavenCentral()
     }