Revert "Camera: Add lastCompletedFrameNumber in CaptureResultExtras"
Revert "Camera: Fix race for onCaptureBufferLost callback"
Revert submission 11415576-bufferErrorLossFix
Reason for revert: Breaks Camera on at least the wembley device
Reverted Changes:
I12b716acc:Camera: Fix race for onCaptureBufferLost callback
I43f0f5ea1:Camera: Add lastCompletedFrameNumber in CaptureRes...
Bug: 158622719
Change-Id: I98440c52f61d571e1cb6692667fb067020746795
Test: Locally tried this revert on rvc-dev on a wembley, and now the Camera works
diff --git a/services/camera/libcameraservice/device3/Camera3OfflineSession.h b/services/camera/libcameraservice/device3/Camera3OfflineSession.h
index c4c7a85..208f70d 100644
--- a/services/camera/libcameraservice/device3/Camera3OfflineSession.h
+++ b/services/camera/libcameraservice/device3/Camera3OfflineSession.h
@@ -57,11 +57,10 @@
const TagMonitor& tagMonitor, const metadata_vendor_id_t vendorTagId,
const bool useHalBufManager, const bool needFixupMonochromeTags,
const bool usePartialResult, const uint32_t numPartialResults,
- const int64_t lastCompletedRegularFN, const int64_t lastCompletedReprocessFN,
- const int64_t lastCompletedZslFN, const uint32_t nextResultFN,
- const uint32_t nextReprocResultFN, const uint32_t nextZslResultFN,
- const uint32_t nextShutterFN, const uint32_t nextReprocShutterFN,
- const uint32_t nextZslShutterFN, const CameraMetadata& deviceInfo,
+ const uint32_t nextResultFN, const uint32_t nextReprocResultFN,
+ const uint32_t nextZslResultFN, const uint32_t nextShutterFN,
+ const uint32_t nextReprocShutterFN, const uint32_t nextZslShutterFN,
+ const CameraMetadata& deviceInfo,
const std::unordered_map<std::string, CameraMetadata>& physicalDeviceInfoMap,
const std::unordered_map<std::string, camera3::DistortionMapper>& distortionMappers,
const std::unordered_map<std::string, camera3::ZoomRatioMapper>& zoomRatioMappers,
@@ -70,9 +69,6 @@
mTagMonitor(tagMonitor), mVendorTagId(vendorTagId),
mUseHalBufManager(useHalBufManager), mNeedFixupMonochromeTags(needFixupMonochromeTags),
mUsePartialResult(usePartialResult), mNumPartialResults(numPartialResults),
- mLastCompletedRegularFrameNumber(lastCompletedRegularFN),
- mLastCompletedReprocessFrameNumber(lastCompletedReprocessFN),
- mLastCompletedZslFrameNumber(lastCompletedZslFN),
mNextResultFrameNumber(nextResultFN),
mNextReprocessResultFrameNumber(nextReprocResultFN),
mNextZslStillResultFrameNumber(nextZslResultFN),
@@ -94,15 +90,6 @@
const bool mUsePartialResult;
const uint32_t mNumPartialResults;
- // The last completed (buffers, result metadata, and error notify) regular
- // request frame number
- const int64_t mLastCompletedRegularFrameNumber;
- // The last completed (buffers, result metadata, and error notify) reprocess
- // request frame number
- const int64_t mLastCompletedReprocessFrameNumber;
- // The last completed (buffers, result metadata, and error notify) zsl
- // request frame number
- const int64_t mLastCompletedZslFrameNumber;
// the minimal frame number of the next non-reprocess result
const uint32_t mNextResultFrameNumber;
// the minimal frame number of the next reprocess result
@@ -227,12 +214,6 @@
std::mutex mOutputLock;
std::list<CaptureResult> mResultQueue;
std::condition_variable mResultSignal;
- // the last completed frame number of regular requests
- int64_t mLastCompletedRegularFrameNumber;
- // the last completed frame number of reprocess requests
- int64_t mLastCompletedReprocessFrameNumber;
- // the last completed frame number of ZSL still capture requests
- int64_t mLastCompletedZslFrameNumber;
// the minimal frame number of the next non-reprocess result
uint32_t mNextResultFrameNumber;
// the minimal frame number of the next reprocess result