[{"id":30470,"web_url":"https://patchwork.libcamera.org/comment/30470/","msgid":"","date":"2024-07-24T13:30:22","subject":"Re: [RFC PATCH 5/6] libcamera: converter_v4l2_m2m: Add helper to\n\tapply controls","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Umang\n\nOn Fri, Jul 12, 2024 at 10:59:19AM GMT, Umang Jain wrote:\n> Add applyControls() helper to apply controls for a stream.\n\nThis assumes controls are applied on the capture queue. Isn't there a\nuse case for applying controls to the output queue ?\n\n>\n> Signed-off-by: Umang Jain \n> ---\n> .../internal/converter/converter_v4l2_m2m.h | 5 +++++\n> src/libcamera/converter/converter_v4l2_m2m.cpp | 18 ++++++++++++++++++\n> 2 files changed, 23 insertions(+)\n>\n> diff --git a/include/libcamera/internal/converter/converter_v4l2_m2m.h b/include/libcamera/internal/converter/converter_v4l2_m2m.h\n> index f61beef8..9d3d62d6 100644\n> --- a/include/libcamera/internal/converter/converter_v4l2_m2m.h\n> +++ b/include/libcamera/internal/converter/converter_v4l2_m2m.h\n> @@ -24,6 +24,7 @@\n>\n> namespace libcamera {\n>\n> +class ControlList;\n> class FrameBuffer;\n> class MediaDevice;\n> class Size;\n> @@ -61,6 +62,8 @@ public:\n> \tint setCrop(const Stream *stream, Rectangle *rect);\n> \tstd::pair getCropBounds(const Stream *stream);\n>\n> +\tint applyControls(const Stream *stream, ControlList &ctrls);\n> +\n> protected:\n> \tclass Mapping\n> \t{\n> @@ -97,6 +100,8 @@ private:\n> \t\tint start();\n> \t\tvoid stop();\n>\n> +\t\tint applyControls(ControlList &ctrls);\n> +\n> \t\tint queueBuffers(FrameBuffer *input, FrameBuffer *output);\n>\n> \t\tint setSelection(unsigned int target, Rectangle *rect);\n> diff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp\n> index 9752a23e..9ff5102a 100644\n> --- a/src/libcamera/converter/converter_v4l2_m2m.cpp\n> +++ b/src/libcamera/converter/converter_v4l2_m2m.cpp\n> @@ -15,6 +15,7 @@\n> #include \n> #include \n>\n> +#include \n> #include \n> #include \n> #include \n> @@ -186,6 +187,11 @@ void V4L2M2MConverter::V4L2M2MStream::captureBufferReady(FrameBuffer *buffer)\n> \tconverter_->outputBufferReady.emit(buffer);\n> }\n>\n> +int V4L2M2MConverter::V4L2M2MStream::applyControls(ControlList &ctrls)\n> +{\n> +\treturn m2m_->capture()->setControls(&ctrls);\n> +};\n> +\n> /* -----------------------------------------------------------------------------\n> * V4L2M2MConverter\n> */\n> @@ -532,6 +538,18 @@ int V4L2M2MConverter::queueBuffers(FrameBuffer *input,\n> \treturn 0;\n> }\n>\n> +/**\n> + * libcamera::Converter::applyControls\n> + */\n> +int V4L2M2MConverter::applyControls(const Stream *stream, ControlList &ctrls)\n> +{\n> +\tauto iter = streams_.find(stream);\n> +\tif (iter == streams_.end())\n> +\t\treturn -EINVAL;\n> +\n> +\treturn iter->second->applyControls(ctrls);\n> +}\n> +\n> /*\n> * \\todo: This should be extended to include Feature::Flag to denote\n> * what each converter supports feature-wise.\n> --\n> 2.45.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 8D343C323E\n\tfor ;\n\tWed, 24 Jul 2024 13:30:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8EBE16336F;\n\tWed, 24 Jul 2024 15:30:28 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0EFE9619A0\n\tfor ;\n\tWed, 24 Jul 2024 15:30:27 +0200 (CEST)","from ideasonboard.com (unknown [91.80.74.127])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B56464CD;\n\tWed, 24 Jul 2024 15:29:43 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"cCvx0k3h\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1721827783;\n\tbh=mE5Qt/jncD7+YxvM0arOJ2E5crKs0BPdrxNOoXtXtR4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=cCvx0k3hBwo3WBETdAYMiCd9C6q0JXyKIFHrXjIVyfcMlvyaieJ8WLPt5iWsnNqW0\n\tk7hxeyKGx7NTVbCVGy3sA0xbx67i75t/n1TgL7eJ37jOSwC04EeFTF8CvWuRdW110P\n\td2Ge/nBPQuz11fAGSykgg0gHmszuq19I/I325IEo=","Date":"Wed, 24 Jul 2024 15:30:22 +0200","From":"Jacopo Mondi ","To":"Umang Jain ","Cc":"libcamera-devel@lists.libcamera.org, \n\tXavier Roumegue ","Subject":"Re: [RFC PATCH 5/6] libcamera: converter_v4l2_m2m: Add helper to\n\tapply controls","Message-ID":"","References":"<20240712052920.33396-1-umang.jain@ideasonboard.com>\n\t<20240712052920.33396-6-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240712052920.33396-6-umang.jain@ideasonboard.com>","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\" "}},{"id":30557,"web_url":"https://patchwork.libcamera.org/comment/30557/","msgid":"<20240802224954.GF3319@pendragon.ideasonboard.com>","date":"2024-08-02T22:49:54","subject":"Re: [RFC PATCH 5/6] libcamera: converter_v4l2_m2m: Add helper to\n\tapply controls","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"On Wed, Jul 24, 2024 at 03:30:22PM +0200, Jacopo Mondi wrote:\n> On Fri, Jul 12, 2024 at 10:59:19AM GMT, Umang Jain wrote:\n> > Add applyControls() helper to apply controls for a stream.\n> \n> This assumes controls are applied on the capture queue. Isn't there a\n> use case for applying controls to the output queue ?\n\nControls are applied on a video device, not a queue, it won't make a\ndifference.\n\n> > Signed-off-by: Umang Jain \n> > ---\n> > .../internal/converter/converter_v4l2_m2m.h | 5 +++++\n> > src/libcamera/converter/converter_v4l2_m2m.cpp | 18 ++++++++++++++++++\n> > 2 files changed, 23 insertions(+)\n> >\n> > diff --git a/include/libcamera/internal/converter/converter_v4l2_m2m.h b/include/libcamera/internal/converter/converter_v4l2_m2m.h\n> > index f61beef8..9d3d62d6 100644\n> > --- a/include/libcamera/internal/converter/converter_v4l2_m2m.h\n> > +++ b/include/libcamera/internal/converter/converter_v4l2_m2m.h\n> > @@ -24,6 +24,7 @@\n> >\n> > namespace libcamera {\n> >\n> > +class ControlList;\n> > class FrameBuffer;\n> > class MediaDevice;\n> > class Size;\n> > @@ -61,6 +62,8 @@ public:\n> > \tint setCrop(const Stream *stream, Rectangle *rect);\n> > \tstd::pair getCropBounds(const Stream *stream);\n> >\n> > +\tint applyControls(const Stream *stream, ControlList &ctrls);\n\nUnless I'm mistaken, the M2M framework doesn't support per-file handle\ncontrols, so you can't have per-stream controls.\n\n> > +\n> > protected:\n> > \tclass Mapping\n> > \t{\n> > @@ -97,6 +100,8 @@ private:\n> > \t\tint start();\n> > \t\tvoid stop();\n> >\n> > +\t\tint applyControls(ControlList &ctrls);\n> > +\n> > \t\tint queueBuffers(FrameBuffer *input, FrameBuffer *output);\n> >\n> > \t\tint setSelection(unsigned int target, Rectangle *rect);\n> > diff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp\n> > index 9752a23e..9ff5102a 100644\n> > --- a/src/libcamera/converter/converter_v4l2_m2m.cpp\n> > +++ b/src/libcamera/converter/converter_v4l2_m2m.cpp\n> > @@ -15,6 +15,7 @@\n> > #include \n> > #include \n> >\n> > +#include \n> > #include \n> > #include \n> > #include \n> > @@ -186,6 +187,11 @@ void V4L2M2MConverter::V4L2M2MStream::captureBufferReady(FrameBuffer *buffer)\n> > \tconverter_->outputBufferReady.emit(buffer);\n> > }\n> >\n> > +int V4L2M2MConverter::V4L2M2MStream::applyControls(ControlList &ctrls)\n> > +{\n> > +\treturn m2m_->capture()->setControls(&ctrls);\n> > +};\n> > +\n> > /* -----------------------------------------------------------------------------\n> > * V4L2M2MConverter\n> > */\n> > @@ -532,6 +538,18 @@ int V4L2M2MConverter::queueBuffers(FrameBuffer *input,\n> > \treturn 0;\n> > }\n> >\n> > +/**\n> > + * libcamera::Converter::applyControls\n> > + */\n> > +int V4L2M2MConverter::applyControls(const Stream *stream, ControlList &ctrls)\n> > +{\n> > +\tauto iter = streams_.find(stream);\n> > +\tif (iter == streams_.end())\n> > +\t\treturn -EINVAL;\n> > +\n> > +\treturn iter->second->applyControls(ctrls);\n> > +}\n> > +\n> > /*\n> > * \\todo: This should be extended to include Feature::Flag to denote\n> > * what each converter supports feature-wise.","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 A040ABDC71\n\tfor ;\n\tFri, 2 Aug 2024 22:50:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D2E2763381;\n\tSat, 3 Aug 2024 00:50:17 +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 E8D506195B\n\tfor ;\n\tSat, 3 Aug 2024 00:50:15 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1B6E73C7;\n\tSat, 3 Aug 2024 00:49:26 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"fyii+wqM\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1722638966;\n\tbh=r9ifKJtQX1TeXvrgQBwDZsE8PHT+2tJ2iyO9+1SJ4NI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=fyii+wqMASVz4SsQx31hD7CmHJBLjGkWRFxvTUPwJ3ePtmhFsvumFc6AYdv9uZcH9\n\tx2xO1qJA8sDGGkmnfTJC0c7h9i6HIzcwh5KBJI6YmVuA2Cn4q6d0Ejbe+6Zjns4RpW\n\tCvPZlgTd677ZmFTcQVsiXP5VWeev8O9So/41NLaM=","Date":"Sat, 3 Aug 2024 01:49:54 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Cc":"Umang Jain ,\n\tlibcamera-devel@lists.libcamera.org,\n\tXavier Roumegue ","Subject":"Re: [RFC PATCH 5/6] libcamera: converter_v4l2_m2m: Add helper to\n\tapply controls","Message-ID":"<20240802224954.GF3319@pendragon.ideasonboard.com>","References":"<20240712052920.33396-1-umang.jain@ideasonboard.com>\n\t<20240712052920.33396-6-umang.jain@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","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\" "}}]