[{"id":12206,"web_url":"https://patchwork.libcamera.org/comment/12206/","msgid":"<20200828154519.GE10034@pendragon.ideasonboard.com>","date":"2020-08-28T15:45:19","subject":"Re: [libcamera-devel] [PATCH v4 5/7] libcamera: raspberrypi: Set\n\tcamera flips correctly from user transform","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi David,\n\nThank you for the patch.\n\nOn Fri, Aug 28, 2020 at 03:41:08PM +0100, David Plowman wrote:\n> The Raspberry Pi pipeline handler allows all transforms except those\n> involving a transpose. The user transform is combined with any\n> inherent rotation of the camera, and the camera's H and V flip bits\n> are set accordingly.\n> \n> Signed-off-by: David Plowman \n> ---\n> .../pipeline/raspberrypi/raspberrypi.cpp | 42 +++++++++++++++----\n> 1 file changed, 34 insertions(+), 8 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index dc36f53..6ea1432 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -400,20 +400,46 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n> \tif (config_.empty())\n> \t\treturn Invalid;\n> \n> -\tif (transform != Transform::Identity) {\n> -\t\ttransform = Transform::Identity;\n> +\t/*\n> +\t * What if the platform has a non-90 degree rotation? We can't even\n> +\t * \"adjust\" the configuration and carry on. Alternatively, raising an\n> +\t * error means the platform can never run. Let's just print a warning\n> +\t * and continue regardless; the rotation is effectively set to zero.\n> +\t */\n> +\tint32_t rotation = data_->sensor_->properties().get(properties::Rotation);\n> +\tbool success;\n> +\tTransform combined = transform * transformFromRotation(rotation, &success);\n> +\tif (!success)\n> +\t\tLOG(RPI, Warning) << \"Invalid rotation of \" << rotation\n> +\t\t\t\t << \" degrees - ignoring\";\n> +\n> +\t/*\n> +\t * We combine the platform and user transform, but must \"adjust away\"\n> +\t * any combined result that includes a transform, as we can't do those.\n> +\t * In this case, flipping only the transpose bit is helpful to\n> +\t * applications - they either get the transform they requested, or have\n> +\t * to do a simple transpose themselves (they don't have to worry about\n> +\t * the other possible cases).\n> +\t */\n> +\tif (!!(combined & Transform::Transpose)) {\n> +\t\t/*\n> +\t\t * Flipping the transpose bit in \"transform\" flips it in\n> +\t\t * combined result too (as it's the last thing that happens).\n> +\t\t */\n> +\t\ttransform ^= Transform::Transpose;\n> +\t\tcombined ^= Transform::Transpose;\n> \t\tstatus = Adjusted;\n> \t}\n> \n> \t/*\n> -\t * Configure the H/V flip controls based on the sensor rotation. We do\n> -\t * this here so that the sensor has the correct Bayer format that will\n> -\t * get advertised in the configuration of any raw streams.\n> +\t * Configure the H/V flip controls based on the combination of the\n> +\t * sensor rotation and the user transform. We do this here so that the\n> +\t * sensor has the correct Bayer format that will get advertised in the\n> +\t * configuration of any raw streams.\n> \t */\n> \tControlList ctrls(data_->unicam_[Unicam::Image].dev()->controls());\n> -\tint32_t rotation = data_->sensor_->properties().get(properties::Rotation);\n> -\tctrls.set(V4L2_CID_HFLIP, static_cast(!!rotation));\n> -\tctrls.set(V4L2_CID_VFLIP, static_cast(!!rotation));\n> +\tctrls.set(V4L2_CID_HFLIP, static_cast(!!(combined & Transform::HFlip)));\n> +\tctrls.set(V4L2_CID_VFLIP, static_cast(!!(combined & Transform::VFlip)));\n> \tdata_->unicam_[Unicam::Image].dev()->setControls(&ctrls);\n\nThe logic looks good, but as discussed elsewhere in the thread, this\nshould be done in configure().\n\n> \n> \tunsigned int rawCount = 0, outCount = 0, count = 0, maxIndex = 0;","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 62C4EBF019\n\tfor ;\n\tFri, 28 Aug 2020 15:45:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C28C2628F3;\n\tFri, 28 Aug 2020 17:45:42 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D2BF46037B\n\tfor ;\n\tFri, 28 Aug 2020 17:45:41 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9313B303;\n\tFri, 28 Aug 2020 17:45:39 +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=\"Z8y1NRd9\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598629539;\n\tbh=Nqnm15ey2680ZGTxgnQwfMhiluAqRDBfmY73QFn+niA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Z8y1NRd9PLqHVuF5T14A07M4N2EsB+KWyWTbGLKMSHUPm+4aP26uItwdsWdFEwDF3\n\tTOc7FDznLD7MJi4UGcJvb0uqbOQUBi33aXjvtJL6bkmFEhultcNC9L7sbCpT+AWfsn\n\tolrjt5MSniii6HfOjHqhq7KEeWBPM+950iv471Nk=","Date":"Fri, 28 Aug 2020 18:45:19 +0300","From":"Laurent Pinchart ","To":"David Plowman ","Message-ID":"<20200828154519.GE10034@pendragon.ideasonboard.com>","References":"<20200828144110.17303-1-david.plowman@raspberrypi.com>\n\t<20200828144110.17303-6-david.plowman@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200828144110.17303-6-david.plowman@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH v4 5/7] libcamera: raspberrypi: Set\n\tcamera flips correctly from user transform","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":12208,"web_url":"https://patchwork.libcamera.org/comment/12208/","msgid":"<9d56a489-c3b4-4588-b27c-022582cfc5c1@ideasonboard.com>","date":"2020-08-28T15:56:17","subject":"Re: [libcamera-devel] [PATCH v4 5/7] libcamera: raspberrypi: Set\n\tcamera flips correctly from user transform","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi David,\n\nOn 28/08/2020 15:41, David Plowman wrote:\n> The Raspberry Pi pipeline handler allows all transforms except those\n> involving a transpose. The user transform is combined with any\n> inherent rotation of the camera, and the camera's H and V flip bits\n> are set accordingly.\n> \n> Signed-off-by: David Plowman \n> ---\n> .../pipeline/raspberrypi/raspberrypi.cpp | 42 +++++++++++++++----\n> 1 file changed, 34 insertions(+), 8 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> index dc36f53..6ea1432 100644\n> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> @@ -400,20 +400,46 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n> \tif (config_.empty())\n> \t\treturn Invalid;\n> \n> -\tif (transform != Transform::Identity) {\n> -\t\ttransform = Transform::Identity;\n> +\t/*\n> +\t * What if the platform has a non-90 degree rotation? We can't even\n> +\t * \"adjust\" the configuration and carry on. Alternatively, raising an\n> +\t * error means the platform can never run. Let's just print a warning\n> +\t * and continue regardless; the rotation is effectively set to zero.\n> +\t */\n\nShould we clamp to the 'nearest' value? I don't imagine it's helpful\neither way ...\n\n\n> +\tint32_t rotation = data_->sensor_->properties().get(properties::Rotation);\n> +\tbool success;\n> +\tTransform combined = transform * transformFromRotation(rotation, &success);\n> +\tif (!success)\n> +\t\tLOG(RPI, Warning) << \"Invalid rotation of \" << rotation\n> +\t\t\t\t << \" degrees - ignoring\";\n> +\n> +\t/*\n> +\t * We combine the platform and user transform, but must \"adjust away\"\n> +\t * any combined result that includes a transform, as we can't do those.\n> +\t * In this case, flipping only the transpose bit is helpful to\n> +\t * applications - they either get the transform they requested, or have\n> +\t * to do a simple transpose themselves (they don't have to worry about\n> +\t * the other possible cases).\n> +\t */\n> +\tif (!!(combined & Transform::Transpose)) {\n\nAre the !! operators required here, does the underlying value not\nrepresent something that can be interpreted as boolean otherwise?\n\nI don't think I object to the double ! operator, just curious about the\n'requirement' of it.\n\n\n> +\t\t/*\n> +\t\t * Flipping the transpose bit in \"transform\" flips it in\n> +\t\t * combined result too (as it's the last thing that happens).\n> +\t\t */\n> +\t\ttransform ^= Transform::Transpose;\n> +\t\tcombined ^= Transform::Transpose;\n> \t\tstatus = Adjusted;\n> \t}\n> \n> \t/*\n> -\t * Configure the H/V flip controls based on the sensor rotation. We do\n> -\t * this here so that the sensor has the correct Bayer format that will\n> -\t * get advertised in the configuration of any raw streams.\n> +\t * Configure the H/V flip controls based on the combination of the\n> +\t * sensor rotation and the user transform. We do this here so that the\n> +\t * sensor has the correct Bayer format that will get advertised in the\n> +\t * configuration of any raw streams.\n> \t */\n> \tControlList ctrls(data_->unicam_[Unicam::Image].dev()->controls());\n> -\tint32_t rotation = data_->sensor_->properties().get(properties::Rotation);\n> -\tctrls.set(V4L2_CID_HFLIP, static_cast(!!rotation));\n> -\tctrls.set(V4L2_CID_VFLIP, static_cast(!!rotation));\n> +\tctrls.set(V4L2_CID_HFLIP, static_cast(!!(combined & Transform::HFlip)));\n> +\tctrls.set(V4L2_CID_VFLIP, static_cast(!!(combined & Transform::VFlip)));\n> \tdata_->unicam_[Unicam::Image].dev()->setControls(&ctrls);\n\nAh, that hflip/vflip is much more readable now :-)\n\nAs highlighted from Laurent though, setting this in validate feels quite\nwrong to me.\n\nI'm not sure if a stream could be actively running while we validate a\nconfiguration, but in theory I think that's the aim - you should be able\nto have an active stream - and validate the next configuration without\ninterfering with a currently active stream...\n\n(Perhaps for example, while determining if a reconfiguration is\npossible, without tearing down the stream until you have a valid set of\nparameters to apply).\n\n\n> \n> \tunsigned int rawCount = 0, outCount = 0, count = 0, maxIndex = 0;\n>","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 B9CA8BDC71\n\tfor ;\n\tFri, 28 Aug 2020 15:56:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 83F9462912;\n\tFri, 28 Aug 2020 17:56:21 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7805F6037B\n\tfor ;\n\tFri, 28 Aug 2020 17:56:20 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1932A303;\n\tFri, 28 Aug 2020 17:56:20 +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=\"wCTsTEGi\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598630180;\n\tbh=eUDj4IM0jS9JOxzWGG0WrucvYhrC0VC26K+QHCzGxOE=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=wCTsTEGioFIVnNbUyUL6+1Dp+ncXqzFH9IIey0Wc3a6X//dQNSg3u1vXVOtPUbQql\n\tp7uKmFF2wnxpCWXZxMr1hlWFqfFrl/zXR/hfBhJHta0Y74vUvr460oYyaUGTQ6NRtJ\n\tbIUJT2Mv6vopxbH8KEIiJZqJKRMtx7UvaEQjtUBQ=","To":"David Plowman ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200828144110.17303-1-david.plowman@raspberrypi.com>\n\t<20200828144110.17303-6-david.plowman@raspberrypi.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<9d56a489-c3b4-4588-b27c-022582cfc5c1@ideasonboard.com>","Date":"Fri, 28 Aug 2020 16:56:17 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20200828144110.17303-6-david.plowman@raspberrypi.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v4 5/7] libcamera: raspberrypi: Set\n\tcamera flips correctly from user transform","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":12214,"web_url":"https://patchwork.libcamera.org/comment/12214/","msgid":"<20200828160610.GI10034@pendragon.ideasonboard.com>","date":"2020-08-28T16:06:10","subject":"Re: [libcamera-devel] [PATCH v4 5/7] libcamera: raspberrypi: Set\n\tcamera flips correctly from user transform","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Fri, Aug 28, 2020 at 04:56:17PM +0100, Kieran Bingham wrote:\n> On 28/08/2020 15:41, David Plowman wrote:\n> > The Raspberry Pi pipeline handler allows all transforms except those\n> > involving a transpose. The user transform is combined with any\n> > inherent rotation of the camera, and the camera's H and V flip bits\n> > are set accordingly.\n> > \n> > Signed-off-by: David Plowman \n> > ---\n> > .../pipeline/raspberrypi/raspberrypi.cpp | 42 +++++++++++++++----\n> > 1 file changed, 34 insertions(+), 8 deletions(-)\n> > \n> > diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > index dc36f53..6ea1432 100644\n> > --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n> > @@ -400,20 +400,46 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n> > \tif (config_.empty())\n> > \t\treturn Invalid;\n> > \n> > -\tif (transform != Transform::Identity) {\n> > -\t\ttransform = Transform::Identity;\n> > +\t/*\n> > +\t * What if the platform has a non-90 degree rotation? We can't even\n> > +\t * \"adjust\" the configuration and carry on. Alternatively, raising an\n> > +\t * error means the platform can never run. Let's just print a warning\n> > +\t * and continue regardless; the rotation is effectively set to zero.\n> > +\t */\n> \n> Should we clamp to the 'nearest' value? I don't imagine it's helpful\n> either way ...\n\nI don't think we support non-90° rotations anywhere, so I wouldn't worry\nabout them. If we had to support that, I think we'd need a different\ncontrol to report a 3D pose (translation and rotation) of the sensor.\n\n> > +\tint32_t rotation = data_->sensor_->properties().get(properties::Rotation);\n> > +\tbool success;\n> > +\tTransform combined = transform * transformFromRotation(rotation, &success);\n> > +\tif (!success)\n> > +\t\tLOG(RPI, Warning) << \"Invalid rotation of \" << rotation\n> > +\t\t\t\t << \" degrees - ignoring\";\n> > +\n> > +\t/*\n> > +\t * We combine the platform and user transform, but must \"adjust away\"\n> > +\t * any combined result that includes a transform, as we can't do those.\n> > +\t * In this case, flipping only the transpose bit is helpful to\n> > +\t * applications - they either get the transform they requested, or have\n> > +\t * to do a simple transpose themselves (they don't have to worry about\n> > +\t * the other possible cases).\n> > +\t */\n> > +\tif (!!(combined & Transform::Transpose)) {\n> \n> Are the !! operators required here, does the underlying value not\n> represent something that can be interpreted as boolean otherwise?\n\nUnfortunately not, it's an enum class, not an enum.\n\n> I don't think I object to the double ! operator, just curious about the\n> 'requirement' of it.\n> \n> > +\t\t/*\n> > +\t\t * Flipping the transpose bit in \"transform\" flips it in\n> > +\t\t * combined result too (as it's the last thing that happens).\n> > +\t\t */\n> > +\t\ttransform ^= Transform::Transpose;\n> > +\t\tcombined ^= Transform::Transpose;\n> > \t\tstatus = Adjusted;\n> > \t}\n> > \n> > \t/*\n> > -\t * Configure the H/V flip controls based on the sensor rotation. We do\n> > -\t * this here so that the sensor has the correct Bayer format that will\n> > -\t * get advertised in the configuration of any raw streams.\n> > +\t * Configure the H/V flip controls based on the combination of the\n> > +\t * sensor rotation and the user transform. We do this here so that the\n> > +\t * sensor has the correct Bayer format that will get advertised in the\n> > +\t * configuration of any raw streams.\n> > \t */\n> > \tControlList ctrls(data_->unicam_[Unicam::Image].dev()->controls());\n> > -\tint32_t rotation = data_->sensor_->properties().get(properties::Rotation);\n> > -\tctrls.set(V4L2_CID_HFLIP, static_cast(!!rotation));\n> > -\tctrls.set(V4L2_CID_VFLIP, static_cast(!!rotation));\n> > +\tctrls.set(V4L2_CID_HFLIP, static_cast(!!(combined & Transform::HFlip)));\n> > +\tctrls.set(V4L2_CID_VFLIP, static_cast(!!(combined & Transform::VFlip)));\n> > \tdata_->unicam_[Unicam::Image].dev()->setControls(&ctrls);\n> \n> Ah, that hflip/vflip is much more readable now :-)\n> \n> As highlighted from Laurent though, setting this in validate feels quite\n> wrong to me.\n> \n> I'm not sure if a stream could be actively running while we validate a\n> configuration, but in theory I think that's the aim - you should be able\n> to have an active stream - and validate the next configuration without\n> interfering with a currently active stream...\n> \n> (Perhaps for example, while determining if a reconfiguration is\n> possible, without tearing down the stream until you have a valid set of\n> parameters to apply).\n> \n> > \n> > \tunsigned int rawCount = 0, outCount = 0, count = 0, maxIndex = 0;\n> >","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 1C50EBDC71\n\tfor ;\n\tFri, 28 Aug 2020 16:06:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9C74F628F3;\n\tFri, 28 Aug 2020 18:06:32 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5ADAC6037B\n\tfor ;\n\tFri, 28 Aug 2020 18:06:31 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D5CDE303;\n\tFri, 28 Aug 2020 18:06:30 +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=\"dmYuzF16\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598630791;\n\tbh=ALHrSZk8k4VMmyR+lFQ5CBonI4vhSvNdpl1CnngBh0w=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dmYuzF16U0ONRh+qQyjv43s/RsGXzPjZg4j5ORk55DQ3B5zPZ3QD2h9LewIkqRj71\n\tku42YlBIUJ+oMLr5yBXIHsK0//OW67s7Wd91ynzV5g3n8U9TeISRWxG9hexjREixpt\n\tcn16Z3MjovaPSBHl+iiyt4AzD3vDdWFan2wa0iIc=","Date":"Fri, 28 Aug 2020 19:06:10 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Message-ID":"<20200828160610.GI10034@pendragon.ideasonboard.com>","References":"<20200828144110.17303-1-david.plowman@raspberrypi.com>\n\t<20200828144110.17303-6-david.plowman@raspberrypi.com>\n\t<9d56a489-c3b4-4588-b27c-022582cfc5c1@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<9d56a489-c3b4-4588-b27c-022582cfc5c1@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v4 5/7] libcamera: raspberrypi: Set\n\tcamera flips correctly from user transform","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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]