diff options
Diffstat (limited to 'libcamera2/ExynosCameraHWInterface2.cpp')
| -rw-r--r-- | libcamera2/ExynosCameraHWInterface2.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp index 49f3cf9..5b399ec 100644 --- a/libcamera2/ExynosCameraHWInterface2.cpp +++ b/libcamera2/ExynosCameraHWInterface2.cpp @@ -3348,18 +3348,12 @@ void ExynosCameraHWInterface2::m_sensorThreadFunc(SignalDrivenThread * self) m_ctlInfo.flash.m_flashDecisionResult = false; } - // TODO : set torch mode for video recording. need to find proper position. - // m_wideAspect is will be changed to recording hint - if ((shot_ext->shot.ctl.flash.flashMode == CAM2_FLASH_MODE_SINGLE) && m_wideAspect) { - shot_ext->shot.ctl.flash.flashMode = CAM2_FLASH_MODE_TORCH; - shot_ext->shot.ctl.flash.firingPower = 10; - m_ctlInfo.flash.m_flashTorchMode = true; - } else if (m_wideAspect){ - shot_ext->shot.ctl.flash.flashMode = CAM2_FLASH_MODE_OFF; - shot_ext->shot.ctl.flash.firingPower = 0; - m_ctlInfo.flash.m_flashTorchMode = false; + if (shot_ext->shot.ctl.flash.flashMode == CAM2_FLASH_MODE_TORCH) { + if (m_ctlInfo.flash.m_flashTorchMode == false) { + m_ctlInfo.flash.m_flashTorchMode = true; + } } else { - if (m_ctlInfo.flash.m_flashTorchMode) { + if (m_ctlInfo.flash.m_flashTorchMode == true) { shot_ext->shot.ctl.flash.flashMode = CAM2_FLASH_MODE_OFF; shot_ext->shot.ctl.flash.firingPower = 0; m_ctlInfo.flash.m_flashTorchMode = false; @@ -4773,7 +4767,7 @@ void ExynosCameraHWInterface2::OnAfTrigger(int id) switch (m_afMode) { case AA_AFMODE_AUTO: case AA_AFMODE_MACRO: - case AA_AFMODE_OFF: + case AA_AFMODE_MANUAL: ALOGV("[AF] OnAfTrigger - AUTO,MACRO,OFF (Mode %d) ", m_afMode); // If flash is enable, Flash operation is executed before triggering AF if ((m_ctlInfo.flash.i_flashMode >= AA_AEMODE_ON_AUTO_FLASH) @@ -4796,6 +4790,7 @@ void ExynosCameraHWInterface2::OnAfTrigger(int id) OnAfTriggerCAFPicture(id); break; + case AA_AFMODE_OFF: default: break; } |