From patchwork Thu Apr 1 10:13:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 11811 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 D9B03C0DA4 for ; Thu, 1 Apr 2021 10:14:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 87F8A68788; Thu, 1 Apr 2021 12:14:04 +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="NQpiwFtQ"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 020D06877D for ; Thu, 1 Apr 2021 12:14:03 +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 A6E75F7; Thu, 1 Apr 2021 12:14:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1617272042; bh=dekIEvQ68+4wkIbN3NGFvrZmLdKcvY2JvRv5zx0mktc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NQpiwFtQcyq0/GorDD4Gif9iHR/EDkyW18MM0MrHd4m6E877Q6E0PfjmXSl9GfMz0 o+GE7fNOgfozp8IDXxEixSPQJ6Uee572UmtnvI0Al3eZVHzabEzfpff1g6MzXYoUo4 W57EqN7d5FILzK1BYXcel5H6plWIzADJbS0T/1CM= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Thu, 1 Apr 2021 19:13:37 +0900 Message-Id: <20210401101340.160590-6-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210401101340.160590-1-paul.elder@ideasonboard.com> References: <20210401101340.160590-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 5/8] android: camera_device: Set noise reduction values for FULL requirements 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 appropriate values for noise reduction to satisfy the requirements for hardware level FULL. These are: - OFF and FAST and HIGH_QUALITY must be supported - the preview template should have noise reduction set to FAST - the capture result metadata should have the noise reduction mode set to the same mode as what was in the request metadata This, along with "android: camera_device: Add separate template for still capture" and "android: camera_device: Set proper frame duration", allows the following CTS tests to pass: - android.hardware.camera2.cts.CameraDeviceTest#testCameraDevicePreviewTemplate - android.hardware.camera2.cts.CameraDeviceTest#testCameraDeviceRecordingTemplate - android.hardware.camera2.cts.CameraDeviceTest#testCameraDeviceStillTemplate - android.hardware.camera2.cts.CaptureRequestTest#testNoiseReductionModeControl - android.hardware.camera2.cts.CaptureRequestTest#testNoiseReductionModeControlFastFps Signed-off-by: Paul Elder --- src/android/camera_device.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 0dcfc880..fc432263 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1087,12 +1087,18 @@ const camera_metadata_t *CameraDevice::getStaticMetadata() { std::vector data; data.reserve(5); + /* + * \todo if this doesn't have OFF and FAST and HIGH_QUALITY + * then this camera does not support FULL + */ const auto &infoMap = controlsInfo.find(&controls::draft::NoiseReductionMode); if (infoMap != controlsInfo.end()) { for (const auto &value : infoMap->second.values()) data.push_back(value.get()); } else { data.push_back(ANDROID_NOISE_REDUCTION_MODE_OFF); + data.push_back(ANDROID_NOISE_REDUCTION_MODE_FAST); + data.push_back(ANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY); } staticMetadata_->addEntry(ANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES, data.data(), data.size()); @@ -1431,7 +1437,8 @@ std::unique_ptr CameraDevice::requestTemplatePreview() requestTemplate->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE, &faceDetectMode, 1); - uint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF; + /* \todo FULL expects this to be FAST, not OFF*/ + uint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_FAST; requestTemplate->addEntry(ANDROID_NOISE_REDUCTION_MODE, &noiseReduction, 1); @@ -2197,7 +2204,9 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor, &value, 1); value = ANDROID_NOISE_REDUCTION_MODE_OFF; - resultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE, &value, 1); + found = settings.getEntry(ANDROID_NOISE_REDUCTION_MODE, &entry); + resultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE, + found ? entry.data.u8 : &value, 1); /* * \todo Use sliding window average