Bug fix

pvasa · Jan 5, 2019 · de906a0 · de906a0
1 parent ce18afe
commit de906a0
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/cameraViewEx/src/main/api21/com/priyankvasa/android/cameraviewex/Camera2.kt b/cameraViewEx/src/main/api21/com/priyankvasa/android/cameraviewex/Camera2.kt
@@ -947,7 +947,7 @@ internal open class Camera2(
                     CameraViewException("Af mode ${config.autoFocus.value} not supported by selected camera. Setting it to off."),
                     ErrorLevel.Warning
             )
-            config.autoFocus.value = Modes.DEFAULT_AUTO_FOCUS
+            config.autoFocus.value = Modes.AutoFocus.AF_OFF
         }
     }
 
@@ -987,7 +987,7 @@ internal open class Camera2(
                     CameraViewException("Awb mode ${config.awb.value} not supported by selected camera. Setting it to off."),
                     ErrorLevel.Warning
             )
-            config.awb.value = Modes.DEFAULT_AWB
+            config.awb.value = Modes.AutoWhiteBalance.AWB_OFF
         }
     }
 
@@ -1001,10 +1001,7 @@ internal open class Camera2(
                         CameraViewException("Optical image stabilization is not supported by selected camera $cameraId. Setting it to off."),
                         ErrorLevel.Warning
                 )
-                previewRequestBuilder.set(
-                        CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE,
-                        CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE_OFF
-                )
+                config.opticalStabilization.value = false
             }
         } else previewRequestBuilder.set(
                 CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE,
@@ -1020,17 +1017,19 @@ internal open class Camera2(
                     CameraViewException("Noise reduction mode ${config.noiseReduction.value} not supported by selected camera. Setting it to off."),
                     ErrorLevel.Warning
             )
-            config.noiseReduction.value = Modes.DEFAULT_NOISE_REDUCTION
+            config.noiseReduction.value = Modes.NoiseReduction.NOISE_REDUCTION_OFF
         }
     }
 
-    private fun updateModes() = runBlocking(Dispatchers.Main) {
-        updateScalerCropRegion()
-        updateAf()
-        updateFlash()
-        updateAwb()
-        updateOis()
-        updateNoiseReduction()
+    private fun updateModes() = runBlocking {
+        GlobalScope.launch(Dispatchers.Main) {
+            updateScalerCropRegion()
+            updateAf()
+            updateFlash()
+            updateAwb()
+            updateOis()
+            updateNoiseReduction()
+        }
     }
 
     /** Locks the focus as the first step for a still image capture. */