From patchwork Fri Jul 30 10:35: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: 13166 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 97C47C322E for ; Fri, 30 Jul 2021 10:36:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 56D66687C5; Fri, 30 Jul 2021 12:36: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="pggSmqYt"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 93206687BF for ; Fri, 30 Jul 2021 12:36: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 8363A89B; Fri, 30 Jul 2021 12:36:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1627641363; bh=i4MwhvEAmCSlhVddVJcr+8iWJ82Xuf/GeIT1Qb2jDrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pggSmqYtB78xz3YvLuL81CyD+behZWfGqTHDGU2LGAE85Q43mLAsppkSbLeoA3siz kwkLzngXsBVUNc6pJT3/na/d3O/dfDtNhtI90AhjtVSuxLddGpRspvfBef30UinUAn 5DJezTgYjttkDjR2FTlWK/qTjKKifwH61cqirG/4= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 30 Jul 2021 19:35:35 +0900 Message-Id: <20210730103536.81117-9-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210730103536.81117-1-paul.elder@ideasonboard.com> References: <20210730103536.81117-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 8/9] android: Add skeletal still and manual request templates 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 skeletal still and manual request templates so that we can expand them for FULL support. Signed-off-by: Paul Elder Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- Changes in v6 - order the template functions alphabetically --- src/android/camera_capabilities.cpp | 18 ++++++++++++++++++ src/android/camera_capabilities.h | 2 ++ src/android/camera_device.cpp | 7 +++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 20d1c99f..1bf3ffa5 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -1323,6 +1323,15 @@ PixelFormat CameraCapabilities::toPixelFormat(int format) const return it->second; } +std::unique_ptr CameraCapabilities::requestTemplateManual() const +{ + std::unique_ptr manualTemplate = requestTemplatePreview(); + if (!manualTemplate) + return nullptr; + + return manualTemplate; +} + std::unique_ptr CameraCapabilities::requestTemplatePreview() const { /* @@ -1412,6 +1421,15 @@ std::unique_ptr CameraCapabilities::requestTemplatePreview() con return requestTemplate; } +std::unique_ptr CameraCapabilities::requestTemplateStill() const +{ + std::unique_ptr stillTemplate = requestTemplatePreview(); + if (!stillTemplate) + return nullptr; + + return stillTemplate; +} + std::unique_ptr CameraCapabilities::requestTemplateVideo() const { std::unique_ptr previewTemplate = requestTemplatePreview(); diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h index dc5339c1..576f1e7c 100644 --- a/src/android/camera_capabilities.h +++ b/src/android/camera_capabilities.h @@ -32,7 +32,9 @@ public: libcamera::PixelFormat toPixelFormat(int format) const; unsigned int maxJpegBufferSize() const { return maxJpegBufferSize_; } + std::unique_ptr requestTemplateManual() const; std::unique_ptr requestTemplatePreview() const; + std::unique_ptr requestTemplateStill() const; std::unique_ptr requestTemplateVideo() const; private: diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 678cde23..692d0a5b 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -487,7 +487,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type) * for the torch mode we currently do not support. */ captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE; - requestTemplate = capabilities_.requestTemplatePreview(); + requestTemplate = capabilities_.requestTemplateStill(); break; case CAMERA3_TEMPLATE_VIDEO_RECORD: captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD; @@ -497,9 +497,12 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type) captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT; requestTemplate = capabilities_.requestTemplateVideo(); break; + case CAMERA3_TEMPLATE_MANUAL: + captureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL; + requestTemplate = capabilities_.requestTemplateManual(); + break; /* \todo Implement templates generation for the remaining use cases. */ case CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG: - case CAMERA3_TEMPLATE_MANUAL: default: LOG(HAL, Error) << "Unsupported template request type: " << type; return nullptr;