{"id":10753,"url":"https://patchwork.libcamera.org/api/patches/10753/?format=json","web_url":"https://patchwork.libcamera.org/patch/10753/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20201228164003.53051-4-jacopo@jmondi.org>","date":"2020-12-28T16:40:01","name":"[libcamera-devel,v2,3/5] libcamera: camera_sensor: Register ColorFilterArrangement","commit_ref":"0a0264da8d6d845b743fdf7ad1092aa26eccc547","pull_url":null,"state":"accepted","archived":false,"hash":"6eec3787a7e30c345c76706dc482bb2c04e44710","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/10753/mbox/","series":[{"id":1556,"url":"https://patchwork.libcamera.org/api/series/1556/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1556","date":"2020-12-28T16:39:58","name":"android: support ColorFilterArrangement property","version":2,"mbox":"https://patchwork.libcamera.org/series/1556/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10753/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10753/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 D13DEC0F1A\n\tfor ;\n\tMon, 28 Dec 2020 16:39:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B6DA462005;\n\tMon, 28 Dec 2020 17:39:56 +0100 (CET)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2AE1D615B0\n\tfor ;\n\tMon, 28 Dec 2020 17:39:55 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 8304724001A;\n\tMon, 28 Dec 2020 16:39:54 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 28 Dec 2020 17:40:01 +0100","Message-Id":"<20201228164003.53051-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20201228164003.53051-1-jacopo@jmondi.org>","References":"<20201228164003.53051-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 3/5] libcamera: camera_sensor: Register\n\tColorFilterArrangement","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Inspect the list of media bus codes supported by the camera sensor\nin order to deduce the color filter arrangement and register the\nColorFilterArrangement draft property.\n\nReviewed-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/camera_sensor.cpp | 36 +++++++++++++++++++++++++++++----\n 1 file changed, 32 insertions(+), 4 deletions(-)","diff":"diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 1628ba9c892b..e786821d4ba2 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -17,6 +17,7 @@\n \n #include \n \n+#include \"libcamera/internal/bayer_format.h\"\n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/sysfs.h\"\n #include \"libcamera/internal/utils.h\"\n@@ -178,10 +179,6 @@ int CameraSensor::init()\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tret = initProperties();\n-\tif (ret)\n-\t\treturn ret;\n-\n \t/* Enumerate, sort and cache media bus codes and sizes. */\n \tformats_ = subdev_->formats(pad_);\n \tif (formats_.empty()) {\n@@ -210,6 +207,10 @@ int CameraSensor::init()\n \t */\n \tresolution_ = sizes_.back();\n \n+\tret = initProperties();\n+\tif (ret)\n+\t\treturn ret;\n+\n \treturn 0;\n }\n \n@@ -307,6 +308,33 @@ int CameraSensor::initProperties()\n \t\tproperties_.set(properties::PixelArrayActiveAreas, { crop });\n \t}\n \n+\t/* Color filter array pattern, register only for RAW sensors. */\n+\tfor (const auto &format : formats_) {\n+\t\tunsigned int mbusCode = format.first;\n+\t\tBayerFormat bayerFormat = BayerFormat::fromMbusCode(mbusCode);\n+\t\tif (!bayerFormat.isValid())\n+\t\t\tcontinue;\n+\n+\t\tint32_t cfa;\n+\t\tswitch (bayerFormat.order) {\n+\t\tcase BayerFormat::BGGR:\n+\t\t\tcfa = properties::draft::BGGR;\n+\t\t\tbreak;\n+\t\tcase BayerFormat::GBRG:\n+\t\t\tcfa = properties::draft::GBRG;\n+\t\t\tbreak;\n+\t\tcase BayerFormat::GRBG:\n+\t\t\tcfa = properties::draft::GRBG;\n+\t\t\tbreak;\n+\t\tcase BayerFormat::RGGB:\n+\t\t\tcfa = properties::draft::RGGB;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tproperties_.set(properties::draft::ColorFilterArrangement, cfa);\n+\t\tbreak;\n+\t}\n+\n \treturn 0;\n }\n \n","prefixes":["libcamera-devel","v2","3/5"]}