hardware: samsung_slsi: libcamera2: Change square aspect resolution

Under VDIS, maximum height of scaler output is 1080.
This patch changes the resolution of square aspect resolution
to 1024 by 1024.
Also removed VDIS and 3DNR mismatch case.

BUG: 7308846
Change-Id: Ia384082ef125263161ac568bef4c3ae74d1984c6
Signed-off-by: Sungjoong Kang <sj3.kang@samsung.com>

diff --git a/libcamera2/ExynosCamera2.cpp b/libcamera2/ExynosCamera2.cpp
index 9c8d887ba422a10a2be0bab13f79e2798de2a6bc..d7ecb60140220f2e7fb7ebb24668663ce51239ee 100644 (file)
--- a/libcamera2/ExynosCamera2.cpp
+++ b/libcamera2/ExynosCamera2.cpp
@@ -211,9 +211,9 @@ ExynosCamera2InfoS5K4E5::~ExynosCamera2InfoS5K4E5()
 }
 const int32_t scalerResolutionS5K6A3[] =
 {
-    1392, 1392, // 1:1
     1344,  896, // 3:2
     1280, 1024, // 5:4
+    1024, 1024, // 1:1
     1280,  960, // 4:3
     1280,  720, // 16:9
      960,  720, // 4:3

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index c8c6602412f4651688fd79c5d3be8d268ad3aca7..df87ed783a73e81dec8486480e5e44c99ac23440 100644 (file)
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -3392,6 +3392,7 @@ void ExynosCameraHWInterface2::m_sensorThreadFunc(SignalDrivenThread * self)
 
             if (m_vdisBubbleCnt > 0 && m_vdisDupFrame == matchedFrameCnt) {
                 shot_ext->dis_bypass = 1;
+                shot_ext->dnr_bypass = 1;
                 shot_ext->request_scp = 0;
                 shot_ext->request_scc = 0;
                 m_vdisBubbleCnt--;