{"id":13166,"url":"https://patchwork.libcamera.org/api/1.1/patches/13166/?format=json","web_url":"https://patchwork.libcamera.org/patch/13166/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210730103536.81117-9-paul.elder@ideasonboard.com>","date":"2021-07-30T10:35:35","name":"[libcamera-devel,v6,8/9] android: Add skeletal still and manual request templates","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"b569b185bc9ce0857db56a4bcd092516b0d28ec6","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13166/mbox/","series":[{"id":2291,"url":"https://patchwork.libcamera.org/api/1.1/series/2291/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2291","date":"2021-07-30T10:35:27","name":"android: Support capability and hardware level detection","version":6,"mbox":"https://patchwork.libcamera.org/series/2291/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13166/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13166/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 97C47C322E\n\tfor ;\n\tFri, 30 Jul 2021 10:36:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 56D66687C5;\n\tFri, 30 Jul 2021 12:36:04 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 93206687BF\n\tfor ;\n\tFri, 30 Jul 2021 12:36:03 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8363A89B;\n\tFri, 30 Jul 2021 12:36:01 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"pggSmqYt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627641363;\n\tbh=i4MwhvEAmCSlhVddVJcr+8iWJ82Xuf/GeIT1Qb2jDrw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=pggSmqYtB78xz3YvLuL81CyD+behZWfGqTHDGU2LGAE85Q43mLAsppkSbLeoA3siz\n\tkwkLzngXsBVUNc6pJT3/na/d3O/dfDtNhtI90AhjtVSuxLddGpRspvfBef30UinUAn\n\t5DJezTgYjttkDjR2FTlWK/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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 8/9] android: Add skeletal still and\n\tmanual request templates","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add skeletal still and manual request templates so that we can expand\nthem for FULL support.\n\nSigned-off-by: Paul Elder \nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n\n---\nChanges in v6\n- order the template functions alphabetically\n---\n src/android/camera_capabilities.cpp | 18 ++++++++++++++++++\n src/android/camera_capabilities.h | 2 ++\n src/android/camera_device.cpp | 7 +++++--\n 3 files changed, 25 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 20d1c99f..1bf3ffa5 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -1323,6 +1323,15 @@ PixelFormat CameraCapabilities::toPixelFormat(int format) const\n \treturn it->second;\n }\n \n+std::unique_ptr CameraCapabilities::requestTemplateManual() const\n+{\n+\tstd::unique_ptr manualTemplate = requestTemplatePreview();\n+\tif (!manualTemplate)\n+\t\treturn nullptr;\n+\n+\treturn manualTemplate;\n+}\n+\n std::unique_ptr CameraCapabilities::requestTemplatePreview() const\n {\n \t/*\n@@ -1412,6 +1421,15 @@ std::unique_ptr CameraCapabilities::requestTemplatePreview() con\n \treturn requestTemplate;\n }\n \n+std::unique_ptr CameraCapabilities::requestTemplateStill() const\n+{\n+\tstd::unique_ptr stillTemplate = requestTemplatePreview();\n+\tif (!stillTemplate)\n+\t\treturn nullptr;\n+\n+\treturn stillTemplate;\n+}\n+\n std::unique_ptr CameraCapabilities::requestTemplateVideo() const\n {\n \tstd::unique_ptr previewTemplate = requestTemplatePreview();\ndiff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\nindex dc5339c1..576f1e7c 100644\n--- a/src/android/camera_capabilities.h\n+++ b/src/android/camera_capabilities.h\n@@ -32,7 +32,9 @@ public:\n \tlibcamera::PixelFormat toPixelFormat(int format) const;\n \tunsigned int maxJpegBufferSize() const { return maxJpegBufferSize_; }\n \n+\tstd::unique_ptr requestTemplateManual() const;\n \tstd::unique_ptr requestTemplatePreview() const;\n+\tstd::unique_ptr requestTemplateStill() const;\n \tstd::unique_ptr requestTemplateVideo() const;\n \n private:\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 678cde23..692d0a5b 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -487,7 +487,7 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \t\t * for the torch mode we currently do not support.\n \t\t */\n \t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_STILL_CAPTURE;\n-\t\trequestTemplate = capabilities_.requestTemplatePreview();\n+\t\trequestTemplate = capabilities_.requestTemplateStill();\n \t\tbreak;\n \tcase CAMERA3_TEMPLATE_VIDEO_RECORD:\n \t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_RECORD;\n@@ -497,9 +497,12 @@ const camera_metadata_t *CameraDevice::constructDefaultRequestSettings(int type)\n \t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_VIDEO_SNAPSHOT;\n \t\trequestTemplate = capabilities_.requestTemplateVideo();\n \t\tbreak;\n+\tcase CAMERA3_TEMPLATE_MANUAL:\n+\t\tcaptureIntent = ANDROID_CONTROL_CAPTURE_INTENT_MANUAL;\n+\t\trequestTemplate = capabilities_.requestTemplateManual();\n+\t\tbreak;\n \t/* \\todo Implement templates generation for the remaining use cases. */\n \tcase CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG:\n-\tcase CAMERA3_TEMPLATE_MANUAL:\n \tdefault:\n \t\tLOG(HAL, Error) << \"Unsupported template request type: \" << type;\n \t\treturn nullptr;\n","prefixes":["libcamera-devel","v6","8/9"]}