From patchwork Wed Jan 27 10:14:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 11032 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 55ACDC0F2B for ; Wed, 27 Jan 2021 10:14:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C7AD268363; Wed, 27 Jan 2021 11:14:48 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="FLFEfxfh"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9044D6835B for ; Wed, 27 Jan 2021 11:14:46 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F1BFE240; Wed, 27 Jan 2021 11:14:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1611742486; bh=ly4L31I6sfNfl0fnT/g6AbGSPpC1TxN9YEGPR0cues4=; h=From:To:Cc:Subject:Date:From; b=FLFEfxfhBjO/p8kVuckglZnnOSMHLnHMKfFmf7SEnKRHC0BQ5k+XPAzX+VwjDXJO6 wwkhxwx3AZEM8xURLvk5OgROf9D+x39RnKwua33ehr/VlLoyGYuHwHMD9Gs6LKxHxh Ke4Qk05DjkX5h6F36BHYWCaUqdcWFUsigf2/bhhQ= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Wed, 27 Jan 2021 19:14:35 +0900 Message-Id: <20210127101435.3903-1-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] android: camera_device: Set AE precapture trigger according to request X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Set the AE precapture triggler tag in the android result metadata according to what was passed in the request metadata. This allows the following CTS test to pass: - android.hardware.camera2.cts.StillCaptureTest#testAePrecaptureTriggerCancelJpegCapture Signed-off-by: Paul Elder --- src/android/camera_device.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 82bf0d3a..941e89a8 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1806,6 +1806,13 @@ void CameraDevice::requestComplete(Request *request) uint64_t timestamp = buffers.begin()->second->metadata().timestamp; resultMetadata = getResultMetadata(descriptor, timestamp); + camera_metadata_ro_entry_t entry; + /* \todo Handle IPA appropriately */ + int ret = descriptor->settings_.getEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER, &entry); + if (ret) + resultMetadata->updateEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER, + entry.data.u8, 1); + /* Handle any JPEG compression. */ for (unsigned int i = 0; i < descriptor->numBuffers_; ++i) { CameraStream *cameraStream = @@ -1832,9 +1839,9 @@ void CameraDevice::requestComplete(Request *request) continue; } - int ret = cameraStream->process(*buffer, &mapped, - descriptor->settings_, - resultMetadata.get()); + ret = cameraStream->process(*buffer, &mapped, + descriptor->settings_, + resultMetadata.get()); if (ret) { status = CAMERA3_BUFFER_STATUS_ERROR; continue;