manta: libcamera2: fix copy-and-paste regression
In "manta: libcamera2: if captured shot drained, record current shot data"
m_reprocessingFrameCnt was taken from previous fragment and not replaced
in the new context with shot_ext->shot.ctl.request.frameCount. This resulted
in CTS:android.hardware.cts.CameraTest@testJpegExif failures.
Bug: 18958123
Change-Id: I3e55fe5be64e2fbc15e14c34891b26afbdb52640
diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index cead739..fa6c8d3 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -3529,7 +3529,8 @@
if (shot_ext->shot.ctl.request.outputStreams[0] & STREAM_MASK_JPEG) {
void *shot = shot_ext;
if (m_ctlInfo.flash.m_flashCnt < IS_FLASH_STATE_CAPTURE) {
- shot = m_requestManager->GetInternalShotExtByFrameCnt(m_reprocessingFrameCnt);
+ shot = m_requestManager->GetInternalShotExtByFrameCnt(
+ shot_ext->shot.ctl.request.frameCount);
if (!shot) { // m_isRequestQueueNull reuse current
ALOGD("(%s): request_scc: "
"m_reprocessingFrameCnt missing, using shot_ext",