{"id":14895,"url":"https://patchwork.libcamera.org/api/1.1/patches/14895/?format=json","web_url":"https://patchwork.libcamera.org/patch/14895/","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":"<20211130124428.2163669-2-hiroh@chromium.org>","date":"2021-11-30T12:44:27","name":"[libcamera-devel,1/2] android: camera_capabilities: Add function to convert PixelFormat to android format","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"000e47f6a65e84ad9762f0ef082591c9476db1be","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/1.1/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14895/mbox/","series":[{"id":2784,"url":"https://patchwork.libcamera.org/api/1.1/series/2784/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2784","date":"2021-11-30T12:44:26","name":"Use PlatfromFrameBufferAllocator in CameraStream","version":1,"mbox":"https://patchwork.libcamera.org/series/2784/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14895/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14895/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 90224BDB13\n\tfor ;\n\tTue, 30 Nov 2021 12:44:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4C95060721;\n\tTue, 30 Nov 2021 13:44:41 +0100 (CET)","from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com\n\t[IPv6:2607:f8b0:4864:20::42d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 351C16071C\n\tfor ;\n\tTue, 30 Nov 2021 13:44:38 +0100 (CET)","by mail-pf1-x42d.google.com with SMTP id r130so20560858pfc.1\n\tfor ;\n\tTue, 30 Nov 2021 04:44:38 -0800 (PST)","from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:203:c90a:5a53:b139:1336])\n\tby smtp.gmail.com with ESMTPSA id\n\tbt2sm2424135pjb.33.2021.11.30.04.44.34\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 30 Nov 2021 04:44:35 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"gafVv0fS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=GITHkqYE3iyWlza17xbqr5Py2eoRlhMegYhPo4txxH0=;\n\tb=gafVv0fS+WdG5g5k2+iFPGv3rW+EcONnmwZcjVM5x6tsGpr4K6P3vdn3+ie3wjGgEa\n\t/weUE9snHeDe/uhUl12YMkGvFFIF71Os87SSECp3PgXiUdYM+tmUSY4Xdav1X2LBEsju\n\tELg9cv/ICiJH+qXKXOnKcxQr1/ByVvCmD00MU=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=GITHkqYE3iyWlza17xbqr5Py2eoRlhMegYhPo4txxH0=;\n\tb=nyHDzKAKQR0tOkNRykN78XDyiUtoqkNBAf5bQJ1+cviXTYGL6cVh/OD1ZTgP24zE+q\n\tXKCG2Qo8Jtf8zeqV4SGUbqu6wtDt+pS9frogHhUi2yx482ss4gA4Ct5eAQqvo7XPGu4X\n\ty0Ui8DU/1ms2/utQmiATndWJlqsZIcZOBDkHIjT0+i9T/eDy9wy81+32ZyyuLPIeQvWR\n\tn31WftcEI0egKZqnuNtuv5WX1+wPV5z/g6BaitnC/iNvN5JMm8jfTz8R3RiCPLp5EU2c\n\tyAZWKKHT5DmEJ6yo80UbKAsr0UNAStFm686qanCfx5nAPzBdw5TRDcSSCGsbgBPVF500\n\tKikw==","X-Gm-Message-State":"AOAM5317gWB838TqnJht0uxfOuhlK0swAEsDNtKQsGvKJoqgAc0+Auub\n\tEWljFRu1g/Xk6Syv9Ad36RIxIU6Wax1aog==","X-Google-Smtp-Source":"ABdhPJyIliwsLSninoTrmQKQfFSSrQOzHTqW1aWS7Vb2Nt1WFuwVx7oN78PJBbl16eMyidKiWsHgIw==","X-Received":"by 2002:a63:66c7:: with SMTP id\n\ta190mr365150pgc.463.1638276276386; \n\tTue, 30 Nov 2021 04:44:36 -0800 (PST)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 30 Nov 2021 21:44:27 +0900","Message-Id":"<20211130124428.2163669-2-hiroh@chromium.org>","X-Mailer":"git-send-email 2.34.0.rc2.393.gf8c9666880-goog","In-Reply-To":"<20211130124428.2163669-1-hiroh@chromium.org>","References":"<20211130124428.2163669-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/2] android: camera_capabilities: Add\n\tfunction to convert PixelFormat to android format","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":"This adds a function to CameraCapabilities of converting PixelFormat\nto android format.\n\nSigned-off-by: Hirokazu Honda \n---\n src/android/camera_capabilities.cpp | 18 ++++++++++++++++++\n src/android/camera_capabilities.h | 2 ++\n 2 files changed, 20 insertions(+)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex f357902e..4c1dc87c 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -545,6 +545,7 @@ int CameraCapabilities::initializeStreamConfigurations()\n \t\t */\n \t\tif (androidFormat == HAL_PIXEL_FORMAT_BLOB) {\n \t\t\tformatsMap_[androidFormat] = formats::MJPEG;\n+\t\t\trevFormatsMap_[formats::MJPEG] = androidFormat;\n \t\t\tLOG(HAL, Debug) << \"Mapped Android format \"\n \t\t\t\t\t<< camera3Format.name << \" to \"\n \t\t\t\t\t<< formats::MJPEG.toString()\n@@ -596,6 +597,7 @@ int CameraCapabilities::initializeStreamConfigurations()\n \t\t * stream configurations map, by testing the image resolutions.\n \t\t */\n \t\tformatsMap_[androidFormat] = mappedFormat;\n+\t\trevFormatsMap_[mappedFormat] = androidFormat;\n \t\tLOG(HAL, Debug) << \"Mapped Android format \"\n \t\t\t\t<< camera3Format.name << \" to \"\n \t\t\t\t<< mappedFormat.toString();\n@@ -1422,6 +1424,22 @@ PixelFormat CameraCapabilities::toPixelFormat(int format) const\n \treturn it->second;\n }\n \n+/*\n+ * Translate libcamera pixel format to Android format code. -1 if no mapped\n+ * android format is found.\n+ */\n+int CameraCapabilities::toAndroidFormat(PixelFormat format) const\n+{\n+\tauto it = revFormatsMap_.find(format);\n+\tif (it == revFormatsMap_.end()) {\n+\t\tLOG(HAL, Error) << \"Requested format \" << format.toString()\n+\t\t\t\t<< \" not supported\";\n+\t\treturn -1;\n+\t}\n+\n+\treturn it->second;\n+}\n+\n std::unique_ptr CameraCapabilities::requestTemplateManual() const\n {\n \tif (!capabilities_.count(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) {\ndiff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\nindex 2cf97ae8..df6361f1 100644\n--- a/src/android/camera_capabilities.h\n+++ b/src/android/camera_capabilities.h\n@@ -30,6 +30,7 @@ public:\n \n \tCameraMetadata *staticMetadata() const { return staticMetadata_.get(); }\n \tlibcamera::PixelFormat toPixelFormat(int format) const;\n+\tint toAndroidFormat(libcamera::PixelFormat format) const;\n \tunsigned int maxJpegBufferSize() const { return maxJpegBufferSize_; }\n \n \tstd::unique_ptr requestTemplateManual() const;\n@@ -77,6 +78,7 @@ private:\n \n \tstd::vector streamConfigurations_;\n \tstd::map formatsMap_;\n+\tstd::map revFormatsMap_;\n \tstd::unique_ptr staticMetadata_;\n \tunsigned int maxJpegBufferSize_;\n \n","prefixes":["libcamera-devel","1/2"]}