commit 9066639a6f082e936de9582e2e8dbaa4383c64ac
author Hyeonmyeong Choi <hyeon.choi@samsung.com> Wed Oct 03 23:58:57 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 03 23:58:57 2012 -0700
tree d5579c9772c2d37a79a8e3b59a3fba981230b786
parent 6c745abe6bdbef3c51d4b9c85d5c11b2c6f2420f
parent 25d9bc8aef93c36c781a45af58604e257df1943c

am 25d9bc8a: am ce77365b: hardware: samsung_slsi: libcamera2: VDIS disable bug fix

* commit '25d9bc8aef93c36c781a45af58604e257df1943c':
  hardware: samsung_slsi: libcamera2: VDIS disable bug fix

libcamera2/ExynosCameraHWInterface2.cpp

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index c8b6c0f..1602795 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -3100,10 +3100,12 @@
         }
 
         if (matchedFrameCnt != -1) {
-            if (m_vdisBubbleCnt == 0) {
+            if (m_vdisBubbleCnt == 0 || m_vdisDupFrame != matchedFrameCnt) {
                 frameTime = systemTime();
                 m_requestManager->RegisterTimestamp(matchedFrameCnt, &frameTime);
                 m_requestManager->UpdateIspParameters(shot_ext, matchedFrameCnt, &m_ctlInfo);
+            } else {
+                ALOGV("bubble for vids: m_vdisBubbleCnt %d, matchedFrameCnt %d", m_vdisDupFrame, matchedFrameCnt);
             }
 
             // face af mode setting in case of face priority scene mode