From patchwork Thu Apr 1 10:13: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: 11809 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 04241C0DA4 for ; Thu, 1 Apr 2021 10:14:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B786568783; Thu, 1 Apr 2021 12:14:00 +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="SRiK8O9y"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7018668782 for ; Thu, 1 Apr 2021 12:13:59 +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 DA7C9527; Thu, 1 Apr 2021 12:13:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1617272039; bh=Isxq6lyRGOGt+hyfbIAxaBP1CCH2NClRWPhXvUlbB7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SRiK8O9yjHvsjuFy+bxlZ1YtI7eyW67yX6HwNGSBuqWgKqvS9PExSBM/omfOdq3PO snreGUdVpEcIN8G76V7ONHOatWp529jBgPHVveARHeNleScw0sZWQ9bLn1lxvfM/1O DEEtfgiYgK55yobYiWM47w28gp6tcCwVxicke1iQ= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Thu, 1 Apr 2021 19:13:35 +0900 Message-Id: <20210401101340.160590-4-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 3/8] android: camera_device: Add separate template for still capture 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" Add a separate template for still capture, so that we can set the noise reduction mode to high quality, as hardware level FULL requires this. This is part of a fix to allow the following CTS test to pass: - android.hardware.camera2.cts.CameraDeviceTest#testCameraDeviceStillTemplate Signed-off-by: Paul Elder --- src/android/camera_device.cpp | 23 ++++++++++++++++++----- src/android/camera_device.h | 1 + 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 30ea3ade..ded57649 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1479,6 +1479,23 @@ std::unique_ptr CameraDevice::requestTemplateVideo() return previewTemplate; } +std::unique_ptr CameraDevice::requestTemplateStill() +{ + std::unique_ptr previewTemplate = requestTemplatePreview(); + if (!previewTemplate) + return nullptr; + + /* + * The still template with FULL requires the noise reduction mode to be + * HIGH_QUALITY. + */ + uint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY; + previewTemplate->updateEntry(ANDROID_NOISE_REDUCTION_MODE, + &noiseReduction, 1); + + return previewTemplate; +} + /* * Produce a metadata pack to be used as template for a capture request. */ @@ -1497,12 +1514,8 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type) requestTemplate = requestTemplatePreview(); break; case CAMERA3_TEMPLATE_STILL_CAPTURE: - /* - * Use the preview template for still capture, they only differ - * for the torch mode we currently do not support. - */ captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE; - requestTemplate = requestTemplatePreview(); + requestTemplate = requestTemplateStill(); break; case CAMERA3_TEMPLATE_VIDEO_RECORD: captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD; diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 11bdfec8..388acf51 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -99,6 +99,7 @@ private: void notifyError(uint32_t frameNumber, camera3_stream_t *stream); std::unique_ptr requestTemplatePreview(); std::unique_ptr requestTemplateVideo(); + std::unique_ptr requestTemplateStill(); libcamera::PixelFormat toPixelFormat(int format) const; int processControls(Camera3RequestDescriptor *descriptor); std::unique_ptr getResultMetadata(