Handle cases when 30 fps is unavailable

(and prevent crash when video mode is directly turned on)

Author: MHShetty

app/src/main/java/app/grapheneos/camera/CamConfig.kt

@@ -361,7 +361,7 @@ class CamConfig(private val mActivity: MainActivity) {
                     modePref.getString(videoFrameRateKey, "")!!
                 )
             } else {
-                SettingValues.Default.VIDEO_FRAME_RATE
+                defaultVideoFrameRate
             }
         }
         set(value) {
@@ -383,6 +383,14 @@ class CamConfig(private val mActivity: MainActivity) {
             return "${SettingValues.Key.VIDEO_FRAME_RATE}_$pf"
         }
 
+    val defaultVideoFrameRate : Range<Int>
+        get() {
+            val availableFrameRates = getAvailableVideoFrameRates()
+            if (availableFrameRates.contains(SettingValues.Default.VIDEO_FRAME_RATE))
+                return SettingValues.Default.VIDEO_FRAME_RATE
+            return availableFrameRates[0]
+        }
+
     var flashMode: Int
         get() = if (imageCapture != null) imageCapture!!.flashMode else
             SettingValues.Default.FLASH_MODE
@@ -956,6 +964,19 @@ class CamConfig(private val mActivity: MainActivity) {
         else frontCameraInfo!!
     }
 
+    fun getAvailableVideoFrameRates():  List<Range<Int>>  {
+        val resSet = getCurrentCameraInfo().supportedFrameRateRanges
+
+        // Individual fps -> Ranged fps (sorted by lower value of range and then upper for each lower value)
+        val resList = resSet.sortedWith(compareBy<Range<Int>> { it.lower != it.upper }.thenBy { it.lower }.thenBy { it.upper })
+
+        // If the supportedFrameRateRange list is somehow empty due to device/library implementation
+        // go with the most likely default rate
+        if (resList.isEmpty()) return listOf(SettingValues.Default.VIDEO_FRAME_RATE)
+
+        return resList
+    }
+
     fun toggleCameraSelector() {
 
         // Manually switch to the opposite lens facing
@@ -1060,7 +1081,6 @@ class CamConfig(private val mActivity: MainActivity) {
         if (mActivity.isDestroyed || mActivity.isFinishing) return
 
         cameraSelector = CameraSelector.Builder()
-            .requireLensFacing(lensFacing)
             .addCameraFilter {
                 return@addCameraFilter listOf(
                     if (lensFacing == CameraSelector.LENS_FACING_BACK) {

app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt

@@ -664,12 +664,6 @@ class SettingsDialog(val mActivity: MainActivity) :
         return Recorder.getVideoCapabilities(cameraInfo).getSupportedQualities(DynamicRange.SDR)
     }
 
-    private fun getAvailableVideoFrameRates():  List<Range<Int>>  {
-        val resSet = camConfig.camera?.cameraInfo?.supportedFrameRateRanges ?: Collections.emptySet()
-        // Individual fps -> Ranged fps (sorted by lower value of range and then upper for each lower value)
-        val resList = resSet.sortedWith(compareBy<Range<Int>> { it.lower != it.upper }.thenBy { it.lower }.thenBy { it.upper })
-        return resList
-    }
 
     private fun getAvailableQualityTitles(): List<String> {
         val titles = arrayListOf<String>()
@@ -681,10 +675,10 @@ class SettingsDialog(val mActivity: MainActivity) :
         return titles
     }
 
-    private fun getAvailableFRTitles(): List<String> {
+    private fun getAvailableFrameRateTitles(): List<String> {
         val titles = arrayListOf<String>()
 
-        getAvailableVideoFrameRates().forEach {
+        camConfig.getAvailableVideoFrameRates().forEach {
             titles.add(getTitleForFrameRateRange(it))
         }
 
@@ -742,7 +736,7 @@ class SettingsDialog(val mActivity: MainActivity) :
     fun reloadVideoSettings() {
 
         val qualityTitles = getAvailableQualityTitles()
-        val frameRateTitles = getAvailableFRTitles()
+        val frameRateTitles = getAvailableFrameRateTitles()
 
         videoQualityAdapter = ArrayAdapter<String>(
             mActivity,