{"id":17837,"url":"https://patchwork.libcamera.org/api/1.1/patches/17837/?format=json","web_url":"https://patchwork.libcamera.org/patch/17837/","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":"<20221122113049.3951-3-david.plowman@raspberrypi.com>","date":"2022-11-22T11:30:49","name":"[libcamera-devel,v3,2/2] libcamera: camera_sensor: Do not clear camera flips when listing formats","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d26a71a20e64b161c078b7b9c9f93670179f7674","submitter":{"id":42,"url":"https://patchwork.libcamera.org/api/1.1/people/42/?format=json","name":"David Plowman","email":"david.plowman@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17837/mbox/","series":[{"id":3628,"url":"https://patchwork.libcamera.org/api/1.1/series/3628/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3628","date":"2022-11-22T11:30:47","name":"Resolve invalid attempts to set sensor flip controls","version":3,"mbox":"https://patchwork.libcamera.org/series/3628/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17837/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17837/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 11F20BDE6B\n\tfor ;\n\tTue, 22 Nov 2022 11:30:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C3259632F8;\n\tTue, 22 Nov 2022 12:30:56 +0100 (CET)","from mail-wr1-x434.google.com (mail-wr1-x434.google.com\n\t[IPv6:2a00:1450:4864:20::434])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DD3D0603CE\n\tfor ;\n\tTue, 22 Nov 2022 12:30:53 +0100 (CET)","by mail-wr1-x434.google.com with SMTP id z4so9659979wrr.3\n\tfor ;\n\tTue, 22 Nov 2022 03:30:53 -0800 (PST)","from pi4-davidp.pitowers.org\n\t([2a00:1098:3142:14:e4a2:3070:eea4:e434])\n\tby smtp.gmail.com with ESMTPSA id\n\ti6-20020a05600c354600b003cf894c05e4sm22713522wmq.22.2022.11.22.03.30.52\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 22 Nov 2022 03:30:52 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1669116656;\n\tbh=ElKufu7CMYATkuoiRAVdVvcfz+UvtRZPr92j7IB7HfU=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=3BthTiot0FTJzzVSKtWhTMjsvDzK9TgdjovcCYejydMqz0uuEa1VrA1JPHy4dUgVn\n\tIisgm6LuFy124/Bj1mzUVT3kKrlCbfm79a2YWjYXORvEppJ4IcmCYMhXHJGTLe/bLI\n\tqb3XyUjTpib0jSyMDzfvX5FpfIOC1VYsahYkBbfoUbYzgelG+bk/eXxUAxhECPk/h5\n\tBqdXskrNcRWHk7ZD77Z96N9mm/t9WhjLeeLg+O8ZTwdOQ3U0fvbXjxEKoPrPMEQljS\n\tan75RGjAAmsvhO8Ao9x2D57anYmNAGsILOl/DWMFvmnDGEFLYRGq8FIILgS0gdYhE0\n\tAo9wGN2xwJjxg==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=eZWGHVFGF7J1lGK7ZZU9Tff95PuQzoZ9l1symSVcbtA=;\n\tb=SYZzwtzVuxpXs9Os45iE9YIytU8LCNBNL4i/GEgTXkaLQ3cPm/X6s6+rjdGD6ry+l0\n\t0/+6fOr930hu3rXRmt9ClCE25oUHB/RhHTOGZeA5dlbJ6XG3TN8Wjy5M/9bW+QaWK9oa\n\tK2RD3JKHrYwl5UKseW/xunRQDQcvId8Zi83vz5jKZ2nWhGvNbWFfv3sFv0GZ0Rst3Zs4\n\tNNfzVBgUvowlyiEmLOUU3y9hk9DJ3+lEXTdL3h2LdWEWQYgNYsFq0Ce97K3I4dyXeDxQ\n\tN5ssvpxx/rYBFGrXyThPuxVCRrLicjcVtcUtJaDmrPlvu8kQTL4p4ZKPqNbtRNw62M58\n\tpzEg=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"SYZzwtzV\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=eZWGHVFGF7J1lGK7ZZU9Tff95PuQzoZ9l1symSVcbtA=;\n\tb=jVptGpQLEcvJ7ohbqn5Dl82rGwHnGuiSSTavqTqlo/EKxoVX7ta5PKblrplsUWYrDV\n\tevFJpt8UwqPCH0RLs6Yh9JhplIQI7ASpCEguadFYUTEo+a4xN/JJPVlP9BBO7ln3exdk\n\tMLb228gDjvQBYmIPwysUmgjMkUCcAC4gdwYS+YBzo6ltCts3NhVvHVJCGeZ34QVyc7Pp\n\tu3weGe+t2Ms+s85Ya5xk40A7+4FIbuvvgJVAErSjGjdZutyj1v/WjlhxVQYfvnQqp/DY\n\tTOifwpvFrysi0uKRRaXmDWIJjfTaMQVQMPcmmxn2v+87DueTlmz9YDZWzyr10/SZl9RI\n\t9Wkw==","X-Gm-Message-State":"ANoB5pnbiXOwCFGb7tH7FXocsdgpXZgDJCmeJ5liadinXHVtRqXbz+P/\n\t2i2QXLUPs+jRD1dQPxm1ClwC+Zz5Ydccug==","X-Google-Smtp-Source":"AA0mqf6d5jILmg+Y/lwrA+KcPUtOq+dHsFyMzApcBjdhNX8gQU/6OpnhXW8nzx8XhgVLPAdXG61lVA==","X-Received":"by 2002:a5d:4c48:0:b0:241:bd2c:bef with SMTP id\n\tn8-20020a5d4c48000000b00241bd2c0befmr8002458wrt.304.1669116653116; \n\tTue, 22 Nov 2022 03:30:53 -0800 (PST)","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 22 Nov 2022 11:30:49 +0000","Message-Id":"<20221122113049.3951-3-david.plowman@raspberrypi.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20221122113049.3951-1-david.plowman@raspberrypi.com>","References":"<20221122113049.3951-1-david.plowman@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/2] libcamera: camera_sensor: Do not\n\tclear camera flips when listing formats","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","From":"David Plowman via libcamera-devel ","Reply-To":"David Plowman ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Previously the code used to clear the camnera's h and v flip bits when\nenumerating the supported formats so as to obtain any Bayer formats in\nthe sensor's native (untransformed) orientation. However this fails\nwhen the camera is already in use elsewhere.\n\nInstead, we query the current state of the flip bits and transform the\nformats - which we obtain in their flipped orientation - back into\ntheir native orientation to be stored.\n\nSigned-off-by: David Plowman \nReviewed-by: Jacopo Mondi \n---\n src/libcamera/camera_sensor.cpp | 49 ++++++++++++++++++++++++++-------\n 1 file changed, 39 insertions(+), 10 deletions(-)","diff":"diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex 572a313a..cbac9e78 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -19,6 +19,8 @@\n \n #include \n \n+#include \n+\n #include \"libcamera/internal/bayer_format.h\"\n #include \"libcamera/internal/camera_lens.h\"\n #include \"libcamera/internal/camera_sensor_properties.h\"\n@@ -108,18 +110,45 @@ int CameraSensor::init()\n \t\treturn ret;\n \n \t/*\n-\t * Clear any flips to be sure we get the \"native\" Bayer order. This is\n-\t * harmless for sensors where the flips don't affect the Bayer order.\n+\t * We want to get the native mbus codes for the sensor, without any flips.\n+\t * We can't clear any flips here, so we have to read the current values\n+\t * (if the flip controls exist), decide whether they actually modify any\n+\t * output Bayer pattern, and finally undo their effect on the formats.\n+\t *\n+\t * First, check if the flip controls exist and if so read them.\n \t */\n-\tControlList ctrls(subdev_->controls());\n-\tif (subdev_->controls().find(V4L2_CID_HFLIP) != subdev_->controls().end())\n-\t\tctrls.set(V4L2_CID_HFLIP, 0);\n-\tif (subdev_->controls().find(V4L2_CID_VFLIP) != subdev_->controls().end())\n-\t\tctrls.set(V4L2_CID_VFLIP, 0);\n-\tsubdev_->setControls(&ctrls);\n+\tstd::vector flipCtrlIds;\n+\tconst struct v4l2_query_ext_ctrl *hflipInfo = subdev_->controlInfo(V4L2_CID_HFLIP);\n+\tconst struct v4l2_query_ext_ctrl *vflipInfo = subdev_->controlInfo(V4L2_CID_VFLIP);\n+\tif (hflipInfo)\n+\t\tflipCtrlIds.push_back(V4L2_CID_HFLIP);\n+\tif (vflipInfo)\n+\t\tflipCtrlIds.push_back(V4L2_CID_VFLIP);\n+\tControlList flipCtrls = subdev_->getControls(flipCtrlIds);\n+\n+\t/* Now construct a transform that would undo any flips. */\n+\tTransform transform = Transform::Identity;\n+\tif (hflipInfo && flipCtrls.get(V4L2_CID_HFLIP).get() &&\n+\t (hflipInfo->flags & V4L2_CTRL_FLAG_MODIFY_LAYOUT))\n+\t\ttransform |= Transform::HFlip;\n+\tif (vflipInfo && flipCtrls.get(V4L2_CID_VFLIP).get() &&\n+\t (vflipInfo->flags & V4L2_CTRL_FLAG_MODIFY_LAYOUT))\n+\t\ttransform |= Transform::VFlip;\n+\n+\t/* Finally get the formats, and apply the transform to the mbus codes. */\n+\tauto formats = subdev_->formats(pad_);\n+\tfor (const auto &format : formats) {\n+\t\tunsigned int mbusCode = format.first;\n+\t\tBayerFormat bayerFormat = BayerFormat::fromMbusCode(mbusCode);\n+\n+\t\tif (bayerFormat.isValid())\n+\t\t\tmbusCode = bayerFormat.transform(transform).toMbusCode();\n+\n+\t\tif (mbusCode)\n+\t\t\tformats_[mbusCode] = std::move(format.second);\n+\t}\n \n \t/* Enumerate, sort and cache media bus codes and sizes. */\n-\tformats_ = subdev_->formats(pad_);\n \tif (formats_.empty()) {\n \t\tLOG(CameraSensor, Error) << \"No image format found\";\n \t\treturn -EINVAL;\n@@ -189,7 +218,7 @@ int CameraSensor::init()\n \t * \\todo The control API ought to have a flag to specify if a control\n \t * is read-only which could be used below.\n \t */\n-\tconst ControlInfo hblank = ctrls.infoMap()->at(V4L2_CID_HBLANK);\n+\tconst ControlInfo hblank = subdev_->controls().at(V4L2_CID_HBLANK);\n \tconst int32_t hblankMin = hblank.min().get();\n \tconst int32_t hblankMax = hblank.max().get();\n \n","prefixes":["libcamera-devel","v3","2/2"]}