Camera3: Support AE precapture trigger CANCEL
Support AE precapture trigger CANCEL for devices <= API
version 3.2.
Bug: 20494782
Change-Id: I6003ba8057ca4ec9e8dfda47b8411ae6be913d22
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index c28a57e..f64a9f0 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -1783,12 +1783,14 @@
*/
status_t Camera3Device::registerInFlight(uint32_t frameNumber,
- int32_t numBuffers, CaptureResultExtras resultExtras, bool hasInput) {
+ int32_t numBuffers, CaptureResultExtras resultExtras, bool hasInput,
+ const AeTriggerCancelOverride_t &aeTriggerCancelOverride) {
ATRACE_CALL();
Mutex::Autolock l(mInFlightLock);
ssize_t res;
- res = mInFlightMap.add(frameNumber, InFlightRequest(numBuffers, resultExtras, hasInput));
+ res = mInFlightMap.add(frameNumber, InFlightRequest(numBuffers, resultExtras, hasInput,
+ aeTriggerCancelOverride));
if (res < 0) return res;
return OK;
@@ -2032,7 +2034,8 @@
CaptureResultExtras &resultExtras,
CameraMetadata &collectedPartialResult,
uint32_t frameNumber,
- bool reprocess) {
+ bool reprocess,
+ const AeTriggerCancelOverride_t &aeTriggerCancelOverride) {
if (pendingMetadata.isEmpty())
return;
@@ -2087,6 +2090,8 @@
return;
}
+ overrideResultForPrecaptureCancel(&captureResult.mMetadata, aeTriggerCancelOverride);
+
// Valid result, insert into queue
List<CaptureResult>::iterator queuedResult =
mResultQueue.insert(mResultQueue.end(), CaptureResult(captureResult));
@@ -2265,7 +2270,8 @@
CameraMetadata metadata;
metadata = result->result;
sendCaptureResult(metadata, request.resultExtras,
- collectedPartialResult, frameNumber, hasInputBufferInRequest);
+ collectedPartialResult, frameNumber, hasInputBufferInRequest,
+ request.aeTriggerCancelOverride);
}
}
@@ -2428,7 +2434,7 @@
// send pending result and buffers
sendCaptureResult(r.pendingMetadata, r.resultExtras,
r.partialResult.collectedResult, msg.frame_number,
- r.hasInputBuffer);
+ r.hasInputBuffer, r.aeTriggerCancelOverride);
returnOutputBuffers(r.pendingOutputBuffers.array(),
r.pendingOutputBuffers.size(), r.shutterTimestamp);
r.pendingOutputBuffers.clear();
@@ -2477,6 +2483,17 @@
mCurrentPreCaptureTriggerId(0),
mRepeatingLastFrameNumber(NO_IN_FLIGHT_REPEATING_FRAMES) {
mStatusId = statusTracker->addComponent();
+
+ mAeLockAvailable = false;
+ sp<Camera3Device> p = parent.promote();
+ if (p != NULL) {
+ camera_metadata_ro_entry aeLockAvailable =
+ p->info().find(ANDROID_CONTROL_AE_LOCK_AVAILABLE);
+ if (aeLockAvailable.count > 0) {
+ mAeLockAvailable = (aeLockAvailable.data.u8[0] ==
+ ANDROID_CONTROL_AE_LOCK_AVAILABLE_TRUE);
+ }
+ }
}
void Camera3Device::RequestThread::setNotificationListener(
@@ -2683,6 +2700,65 @@
mRequestSignal.signal();
}
+
+/**
+ * For devices <= CAMERA_DEVICE_API_VERSION_3_2, AE_PRECAPTURE_TRIGGER_CANCEL is not supported so
+ * we need to override AE_PRECAPTURE_TRIGGER_CANCEL to AE_PRECAPTURE_TRIGGER_IDLE and AE_LOCK_OFF
+ * to AE_LOCK_ON to start cancelling AE precapture. If AE lock is not available, it still overrides
+ * AE_PRECAPTURE_TRIGGER_CANCEL to AE_PRECAPTURE_TRIGGER_IDLE but doesn't add AE_LOCK_ON to the
+ * request.
+ */
+void Camera3Device::RequestThread::handleAePrecaptureCancelRequest(sp<CaptureRequest> request) {
+ request->mAeTriggerCancelOverride.applyAeLock = false;
+ request->mAeTriggerCancelOverride.applyAePrecaptureTrigger = false;
+
+ if (mHal3Device->common.version > CAMERA_DEVICE_API_VERSION_3_2) {
+ return;
+ }
+
+ camera_metadata_entry_t aePrecaptureTrigger =
+ request->mSettings.find(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER);
+ if (aePrecaptureTrigger.count > 0 &&
+ aePrecaptureTrigger.data.u8[0] == ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL) {
+ // Always override CANCEL to IDLE
+ uint8_t aePrecaptureTrigger = ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE;
+ request->mSettings.update(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER, &aePrecaptureTrigger, 1);
+ request->mAeTriggerCancelOverride.applyAePrecaptureTrigger = true;
+ request->mAeTriggerCancelOverride.aePrecaptureTrigger =
+ ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL;
+
+ if (mAeLockAvailable == true) {
+ camera_metadata_entry_t aeLock = request->mSettings.find(ANDROID_CONTROL_AE_LOCK);
+ if (aeLock.count == 0 || aeLock.data.u8[0] == ANDROID_CONTROL_AE_LOCK_OFF) {
+ uint8_t aeLock = ANDROID_CONTROL_AE_LOCK_ON;
+ request->mSettings.update(ANDROID_CONTROL_AE_LOCK, &aeLock, 1);
+ request->mAeTriggerCancelOverride.applyAeLock = true;
+ request->mAeTriggerCancelOverride.aeLock = ANDROID_CONTROL_AE_LOCK_OFF;
+ }
+ }
+ }
+}
+
+/**
+ * Override result metadata for cancelling AE precapture trigger applied in
+ * handleAePrecaptureCancelRequest().
+ */
+void Camera3Device::overrideResultForPrecaptureCancel(
+ CameraMetadata *result, const AeTriggerCancelOverride_t &aeTriggerCancelOverride) {
+ if (aeTriggerCancelOverride.applyAeLock) {
+ // Only devices <= v3.2 should have this override
+ assert(mDeviceVersion <= CAMERA_DEVICE_API_VERSION_3_2);
+ result->update(ANDROID_CONTROL_AE_LOCK, &aeTriggerCancelOverride.aeLock, 1);
+ }
+
+ if (aeTriggerCancelOverride.applyAePrecaptureTrigger) {
+ // Only devices <= v3.2 should have this override
+ assert(mDeviceVersion <= CAMERA_DEVICE_API_VERSION_3_2);
+ result->update(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER,
+ &aeTriggerCancelOverride.aePrecaptureTrigger, 1);
+ }
+}
+
bool Camera3Device::RequestThread::threadLoop() {
status_t res;
@@ -2822,7 +2898,8 @@
res = parent->registerInFlight(request.frame_number,
totalNumBuffers, nextRequest->mResultExtras,
- /*hasInput*/request.input_buffer != NULL);
+ /*hasInput*/request.input_buffer != NULL,
+ nextRequest->mAeTriggerCancelOverride);
ALOGVV("%s: registered in flight requestId = %" PRId32 ", frameNumber = %" PRId64
", burstId = %" PRId32 ".",
__FUNCTION__,
@@ -3048,6 +3125,9 @@
}
}
}
+
+ handleAePrecaptureCancelRequest(nextRequest);
+
mNextRequest = nextRequest;
return nextRequest;
@@ -3437,6 +3517,7 @@
const camera3_capture_result *result) {
Camera3Device *d =
const_cast<Camera3Device*>(static_cast<const Camera3Device*>(cb));
+
d->processCaptureResult(result);
}