From patchwork Thu Apr 22 09:41:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 12077 X-Patchwork-Delegate: paul.elder@ideasonboard.com 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 2CEE4BDB17 for ; Thu, 22 Apr 2021 09:41:34 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AF63E68865; Thu, 22 Apr 2021 11:41:33 +0200 (CEST) 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="iPcup3IU"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AF47A6883E for ; Thu, 22 Apr 2021 11:41:30 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 707863EE; Thu, 22 Apr 2021 11:41:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1619084490; bh=u/VhtE817BG5sUZK4UJUd8b8nK3Jeg1JwwZWsNU1cBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iPcup3IU5j3dvfVdOcpKKuhj8f1t5MqRzuwIK9mhWpAIH6vAMeaoYBj+ZJLD/gPPd qu33od9yPHzU6KTSgfwRpX7CJOEcIH6rx5DXHKbY83y1lWI7robZ8gLe9zhWpYYzfK 0FjrlIXuqq/dZJmpOSWzSKBjeJZcz9KEDfvQE4x0= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Thu, 22 Apr 2021 18:41:00 +0900 Message-Id: <20210422094102.371772-11-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210422094102.371772-1-paul.elder@ideasonboard.com> References: <20210422094102.371772-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v2 10/12] android: camera_device: Translate android controls to libcamera controls 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" Translate the newly added android controls that are required to FULL compliance into libcamera controls before sending them to the Camera. Signed-off-by: Paul Elder Reviewed-by: Jacopo Mondi --- src/android/camera_device.cpp | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 99c67555..30692a67 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -2136,15 +2136,46 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor) /* Translate the Android request settings to libcamera controls. */ camera_metadata_ro_entry_t entry; + ControlList &controls = descriptor->request_->controls(); + if (settings.getEntry(ANDROID_SCALER_CROP_REGION, &entry)) { const int32_t *data = entry.data.i32; Rectangle cropRegion{ data[0], data[1], static_cast(data[2]), static_cast(data[3]) }; - ControlList &controls = descriptor->request_->controls(); controls.set(controls::ScalerCrop, cropRegion); } + if (settings.getEntry(ANDROID_SENSOR_EXPOSURE_TIME, &entry)) + controls.set(controls::ExposureTime, *entry.data.i64 / 1000ULL); + + if (settings.getEntry(ANDROID_BLACK_LEVEL_LOCK, &entry)) + controls.set(controls::draft::BlackLevelLocked, *entry.data.u8); + + if (settings.getEntry(ANDROID_CONTROL_AE_LOCK, &entry)) + controls.set(controls::AeLocked, *entry.data.u8); + + if (settings.getEntry(ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER, &entry)) + controls.set(controls::draft::AePrecaptureTrigger, *entry.data.u8); + + if (settings.getEntry(ANDROID_CONTROL_AWB_MODE, &entry)) + controls.set(controls::AwbMode, *entry.data.u8); + + if (settings.getEntry(ANDROID_CONTROL_AWB_LOCK, &entry)) + controls.set(controls::AwbLocked, *entry.data.u8); + + if (settings.getEntry(ANDROID_EDGE_MODE, &entry)) + controls.set(controls::draft::EdgeMode, *entry.data.u8); + + if (settings.getEntry(ANDROID_NOISE_REDUCTION_MODE, &entry)) + controls.set(controls::draft::NoiseReductionMode, *entry.data.u8); + + if (settings.getEntry(ANDROID_SENSOR_SENSITIVITY, &entry)) + controls.set(controls::draft::SensorSensitivity, *entry.data.i32); + + if (settings.getEntry(ANDROID_TONEMAP_MODE, &entry)) + controls.set(controls::draft::TonemapMode, *entry.data.u8); + return 0; }