[{"id":15390,"web_url":"https://patchwork.libcamera.org/comment/15390/","msgid":"<20210302054526.GA35047@pyrite.rasen.tech>","date":"2021-03-02T05:45:26","subject":"Re: [libcamera-devel] [PATCH 15/20] libcamera: pipeline: simple:\n\tAdd output formats to Configuration","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nOn Mon, Feb 01, 2021 at 12:46:57AM +0200, Laurent Pinchart wrote:\n> Store the list of converter output formats in the Configuration\n> structure, to be used to implement multi-stream support. As the\n> Configuration structure grows bigger, avoid duplicating it in the\n> formats_ map for each supported pixel format by storing it in a configs_\n> vector instead, and storing pointers only in the map.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> ---\n>  src/libcamera/pipeline/simple/simple.cpp | 40 ++++++++++++++----------\n>  1 file changed, 23 insertions(+), 17 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index c44fa9ee28ed..6a8253101a61 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -159,6 +159,7 @@ public:\n>  \t\tuint32_t code;\n>  \t\tPixelFormat captureFormat;\n>  \t\tSize captureSize;\n> +\t\tstd::vector<PixelFormat> outputFormats;\n>  \t\tSizeRange outputSizes;\n>  \t};\n>  \n> @@ -167,7 +168,8 @@ public:\n>  \tstd::list<Entity> entities_;\n>  \tV4L2VideoDevice *video_;\n>  \n> -\tstd::map<PixelFormat, Configuration> formats_;\n> +\tstd::vector<Configuration> configs_;\n> +\tstd::map<PixelFormat, const Configuration *> formats_;\n>  };\n>  \n>  class SimpleCameraConfiguration : public CameraConfiguration\n> @@ -371,13 +373,6 @@ int SimpleCameraData::init()\n>  \t\t\t\t       })\n>  \t\t\t<< \" ]\";\n>  \n> -\t\t/*\n> -\t\t * Store the configuration in the formats_ map, mapping the\n> -\t\t * PixelFormat to the corresponding configuration. Any\n> -\t\t * previously stored value is overwritten, as the pipeline\n> -\t\t * handler currently doesn't care about how a particular\n> -\t\t * PixelFormat is achieved.\n> -\t\t */\n>  \t\tfor (const auto &videoFormat : videoFormats) {\n>  \t\t\tPixelFormat pixelFormat = videoFormat.first.toPixelFormat();\n>  \t\t\tif (!pixelFormat)\n> @@ -389,23 +384,34 @@ int SimpleCameraData::init()\n>  \t\t\tconfig.captureSize = format.size;\n>  \n>  \t\t\tif (!converter) {\n> +\t\t\t\tconfig.outputFormats = { pixelFormat };\n>  \t\t\t\tconfig.outputSizes = config.captureSize;\n> -\t\t\t\tformats_[pixelFormat] = config;\n> -\t\t\t\tcontinue;\n> +\t\t\t} else {\n> +\t\t\t\tconfig.outputFormats = converter->formats(pixelFormat);\n> +\t\t\t\tconfig.outputSizes = converter->sizes(format.size);\n>  \t\t\t}\n>  \n> -\t\t\tconfig.outputSizes = converter->sizes(format.size);\n> -\n> -\t\t\tfor (PixelFormat fmt : converter->formats(pixelFormat))\n> -\t\t\t\tformats_[fmt] = config;\n> +\t\t\tconfigs_.push_back(config);\n>  \t\t}\n>  \t}\n>  \n> -\tif (formats_.empty()) {\n> +\tif (configs_.empty()) {\n>  \t\tLOG(SimplePipeline, Error) << \"No valid configuration found\";\n>  \t\treturn -EINVAL;\n>  \t}\n>  \n> +\t/*\n> +\t * Map the pixel formats to configurations. Any previously stored value\n> +\t * is overwritten, as the pipeline handler currently doesn't care about\n> +\t * how a particular PixelFormat is achieved.\n> +\t */\n> +\tfor (const Configuration &config : configs_) {\n> +\t\tformats_[config.captureFormat] = &config;\n> +\n> +\t\tfor (PixelFormat fmt : config.outputFormats)\n> +\t\t\tformats_[fmt] = &config;\n> +\t}\n> +\n>  \tproperties_ = sensor_->properties();\n>  \n>  \treturn 0;\n> @@ -548,7 +554,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n>  \t\tstatus = Adjusted;\n>  \t}\n>  \n> -\tpipeConfig_ = &it->second;\n> +\tpipeConfig_ = it->second;\n\nI think this belongs in the previous patch.\n\n\nThe rest looks good to me.\n\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\n\n>  \tif (!pipeConfig_->outputSizes.contains(cfg.size)) {\n>  \t\tLOG(SimplePipeline, Debug)\n>  \t\t\t<< \"Adjusting size from \" << cfg.size.toString()\n> @@ -614,7 +620,7 @@ CameraConfiguration *SimplePipelineHandler::generateConfiguration(Camera *camera\n>  \t\t       std::inserter(formats, formats.end()),\n>  \t\t       [](const auto &format) -> decltype(formats)::value_type {\n>  \t\t\t       const PixelFormat &pixelFormat = format.first;\n> -\t\t\t       const Size &size = format.second.captureSize;\n> +\t\t\t       const Size &size = format.second->captureSize;\n>  \t\t\t       return { pixelFormat, { size } };\n>  \t\t       });","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 8BFA3BD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue,  2 Mar 2021 05:45:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E9AF668A92;\n\tTue,  2 Mar 2021 06:45:34 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 21A7F60522\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  2 Mar 2021 06:45:34 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3440845D;\n\tTue,  2 Mar 2021 06:45:31 +0100 (CET)"],"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=\"MCLSi4eS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1614663933;\n\tbh=vNF4WbB5anmBJCxQpLpgDa377akC/NFzVSb+WiHdB6E=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=MCLSi4eSnGG+qw7MgyZqMFtCxJZNbYmy7UGaY/sHOh5/KwG61WOL8QLFKq0zw5RvK\n\tUekFSCAmRRDoQm/daEuLhADyQqLPmcmdex/jyBQLa90fq1HkcVBIRJHg7dOixVPl0r\n\tbSUq8kzehCSNBTShALikLZwOddhbI3nLhD7XMg/Y=","Date":"Tue, 2 Mar 2021 14:45:26 +0900","From":"paul.elder@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Message-ID":"<20210302054526.GA35047@pyrite.rasen.tech>","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>\n\t<20210131224702.8838-16-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210131224702.8838-16-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 15/20] libcamera: pipeline: simple:\n\tAdd output formats to Configuration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"Phi-Bang Nguyen <pnguyen@baylibre.com>,\n\tlibcamera-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\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":15401,"web_url":"https://patchwork.libcamera.org/comment/15401/","msgid":"<YD4P1O9ZspdUSM9h@pendragon.ideasonboard.com>","date":"2021-03-02T10:13:40","subject":"Re: [libcamera-devel] [PATCH 15/20] libcamera: pipeline: simple:\n\tAdd output formats to Configuration","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nOn Tue, Mar 02, 2021 at 02:45:26PM +0900, paul.elder@ideasonboard.com wrote:\n> On Mon, Feb 01, 2021 at 12:46:57AM +0200, Laurent Pinchart wrote:\n> > Store the list of converter output formats in the Configuration\n> > structure, to be used to implement multi-stream support. As the\n> > Configuration structure grows bigger, avoid duplicating it in the\n> > formats_ map for each supported pixel format by storing it in a configs_\n> > vector instead, and storing pointers only in the map.\n> > \n> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> > ---\n> >  src/libcamera/pipeline/simple/simple.cpp | 40 ++++++++++++++----------\n> >  1 file changed, 23 insertions(+), 17 deletions(-)\n> > \n> > diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> > index c44fa9ee28ed..6a8253101a61 100644\n> > --- a/src/libcamera/pipeline/simple/simple.cpp\n> > +++ b/src/libcamera/pipeline/simple/simple.cpp\n> > @@ -159,6 +159,7 @@ public:\n> >  \t\tuint32_t code;\n> >  \t\tPixelFormat captureFormat;\n> >  \t\tSize captureSize;\n> > +\t\tstd::vector<PixelFormat> outputFormats;\n> >  \t\tSizeRange outputSizes;\n> >  \t};\n> >  \n> > @@ -167,7 +168,8 @@ public:\n> >  \tstd::list<Entity> entities_;\n> >  \tV4L2VideoDevice *video_;\n> >  \n> > -\tstd::map<PixelFormat, Configuration> formats_;\n> > +\tstd::vector<Configuration> configs_;\n> > +\tstd::map<PixelFormat, const Configuration *> formats_;\n> >  };\n> >  \n> >  class SimpleCameraConfiguration : public CameraConfiguration\n> > @@ -371,13 +373,6 @@ int SimpleCameraData::init()\n> >  \t\t\t\t       })\n> >  \t\t\t<< \" ]\";\n> >  \n> > -\t\t/*\n> > -\t\t * Store the configuration in the formats_ map, mapping the\n> > -\t\t * PixelFormat to the corresponding configuration. Any\n> > -\t\t * previously stored value is overwritten, as the pipeline\n> > -\t\t * handler currently doesn't care about how a particular\n> > -\t\t * PixelFormat is achieved.\n> > -\t\t */\n> >  \t\tfor (const auto &videoFormat : videoFormats) {\n> >  \t\t\tPixelFormat pixelFormat = videoFormat.first.toPixelFormat();\n> >  \t\t\tif (!pixelFormat)\n> > @@ -389,23 +384,34 @@ int SimpleCameraData::init()\n> >  \t\t\tconfig.captureSize = format.size;\n> >  \n> >  \t\t\tif (!converter) {\n> > +\t\t\t\tconfig.outputFormats = { pixelFormat };\n> >  \t\t\t\tconfig.outputSizes = config.captureSize;\n> > -\t\t\t\tformats_[pixelFormat] = config;\n> > -\t\t\t\tcontinue;\n> > +\t\t\t} else {\n> > +\t\t\t\tconfig.outputFormats = converter->formats(pixelFormat);\n> > +\t\t\t\tconfig.outputSizes = converter->sizes(format.size);\n> >  \t\t\t}\n> >  \n> > -\t\t\tconfig.outputSizes = converter->sizes(format.size);\n> > -\n> > -\t\t\tfor (PixelFormat fmt : converter->formats(pixelFormat))\n> > -\t\t\t\tformats_[fmt] = config;\n> > +\t\t\tconfigs_.push_back(config);\n> >  \t\t}\n> >  \t}\n> >  \n> > -\tif (formats_.empty()) {\n> > +\tif (configs_.empty()) {\n> >  \t\tLOG(SimplePipeline, Error) << \"No valid configuration found\";\n> >  \t\treturn -EINVAL;\n> >  \t}\n> >  \n> > +\t/*\n> > +\t * Map the pixel formats to configurations. Any previously stored value\n> > +\t * is overwritten, as the pipeline handler currently doesn't care about\n> > +\t * how a particular PixelFormat is achieved.\n> > +\t */\n> > +\tfor (const Configuration &config : configs_) {\n> > +\t\tformats_[config.captureFormat] = &config;\n> > +\n> > +\t\tfor (PixelFormat fmt : config.outputFormats)\n> > +\t\t\tformats_[fmt] = &config;\n> > +\t}\n> > +\n> >  \tproperties_ = sensor_->properties();\n> >  \n> >  \treturn 0;\n> > @@ -548,7 +554,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n> >  \t\tstatus = Adjusted;\n> >  \t}\n> >  \n> > -\tpipeConfig_ = &it->second;\n> > +\tpipeConfig_ = it->second;\n> \n> I think this belongs in the previous patch.\n\nI don't think so. it iterates over data_->formats_, whose type has\nchanged in this patch.\n\n> The rest looks good to me.\n> \n> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>\n> \n> >  \tif (!pipeConfig_->outputSizes.contains(cfg.size)) {\n> >  \t\tLOG(SimplePipeline, Debug)\n> >  \t\t\t<< \"Adjusting size from \" << cfg.size.toString()\n> > @@ -614,7 +620,7 @@ CameraConfiguration *SimplePipelineHandler::generateConfiguration(Camera *camera\n> >  \t\t       std::inserter(formats, formats.end()),\n> >  \t\t       [](const auto &format) -> decltype(formats)::value_type {\n> >  \t\t\t       const PixelFormat &pixelFormat = format.first;\n> > -\t\t\t       const Size &size = format.second.captureSize;\n> > +\t\t\t       const Size &size = format.second->captureSize;\n> >  \t\t\t       return { pixelFormat, { size } };\n> >  \t\t       });\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 35C45BD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue,  2 Mar 2021 10:14:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0381F68A91;\n\tTue,  2 Mar 2021 11:14:12 +0100 (CET)","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 5FA3360106\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  2 Mar 2021 11:14:10 +0100 (CET)","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 DC35F45D;\n\tTue,  2 Mar 2021 11:14:09 +0100 (CET)"],"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=\"FrzNz2+W\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1614680050;\n\tbh=eF78CZTfKZkoNXvNZ/VtsCSayUk5jfDD782lFdnM+yI=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=FrzNz2+WwNh9/hYiPYHv10GDsJU3x0sbRr5u0ZcvyKVNYVmiyzGGsgTIUxQCqlocH\n\tzacKkeK1rCIEkNWn4JOMlrOq5GEwDRJjlGPV8t5JoOQYHC938CSWLE/zduhOyDg6+p\n\tmv40z1eKH4sg+w4gYCN1Rqva+Ju8U9RFrcnPQqRg=","Date":"Tue, 2 Mar 2021 12:13:40 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"paul.elder@ideasonboard.com","Message-ID":"<YD4P1O9ZspdUSM9h@pendragon.ideasonboard.com>","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>\n\t<20210131224702.8838-16-laurent.pinchart@ideasonboard.com>\n\t<20210302054526.GA35047@pyrite.rasen.tech>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210302054526.GA35047@pyrite.rasen.tech>","Subject":"Re: [libcamera-devel] [PATCH 15/20] libcamera: pipeline: simple:\n\tAdd output formats to Configuration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"Phi-Bang Nguyen <pnguyen@baylibre.com>,\n\tlibcamera-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\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":15403,"web_url":"https://patchwork.libcamera.org/comment/15403/","msgid":"<b9574387-e562-bdb8-b3aa-2f9c6bddd690@ideasonboard.com>","date":"2021-03-02T10:17:56","subject":"Re: [libcamera-devel] [PATCH 15/20] libcamera: pipeline: simple:\n\tAdd output formats to Configuration","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 31/01/2021 22:46, Laurent Pinchart wrote:\n> Store the list of converter output formats in the Configuration\n> structure, to be used to implement multi-stream support. As the\n> Configuration structure grows bigger, avoid duplicating it in the\n> formats_ map for each supported pixel format by storing it in a configs_\n> vector instead, and storing pointers only in the map.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  src/libcamera/pipeline/simple/simple.cpp | 40 ++++++++++++++----------\n>  1 file changed, 23 insertions(+), 17 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index c44fa9ee28ed..6a8253101a61 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -159,6 +159,7 @@ public:\n>  \t\tuint32_t code;\n>  \t\tPixelFormat captureFormat;\n>  \t\tSize captureSize;\n> +\t\tstd::vector<PixelFormat> outputFormats;\n>  \t\tSizeRange outputSizes;\n>  \t};\n>  \n> @@ -167,7 +168,8 @@ public:\n>  \tstd::list<Entity> entities_;\n>  \tV4L2VideoDevice *video_;\n>  \n> -\tstd::map<PixelFormat, Configuration> formats_;\n> +\tstd::vector<Configuration> configs_;\n> +\tstd::map<PixelFormat, const Configuration *> formats_;\n\nEeep, this scares me ...\nAre they kept in sync?\n\nOnly used having pre-reserved, to ensure the pointers stay valid etc...\n\n\n>  };\n>  \n>  class SimpleCameraConfiguration : public CameraConfiguration\n> @@ -371,13 +373,6 @@ int SimpleCameraData::init()\n>  \t\t\t\t       })\n>  \t\t\t<< \" ]\";\n>  \n> -\t\t/*\n> -\t\t * Store the configuration in the formats_ map, mapping the\n> -\t\t * PixelFormat to the corresponding configuration. Any\n> -\t\t * previously stored value is overwritten, as the pipeline\n> -\t\t * handler currently doesn't care about how a particular\n> -\t\t * PixelFormat is achieved.\n> -\t\t */\n>  \t\tfor (const auto &videoFormat : videoFormats) {\n>  \t\t\tPixelFormat pixelFormat = videoFormat.first.toPixelFormat();\n>  \t\t\tif (!pixelFormat)\n> @@ -389,23 +384,34 @@ int SimpleCameraData::init()\n>  \t\t\tconfig.captureSize = format.size;\n>  \n>  \t\t\tif (!converter) {\n> +\t\t\t\tconfig.outputFormats = { pixelFormat };\n>  \t\t\t\tconfig.outputSizes = config.captureSize;\n> -\t\t\t\tformats_[pixelFormat] = config;\n> -\t\t\t\tcontinue;\n> +\t\t\t} else {\n> +\t\t\t\tconfig.outputFormats = converter->formats(pixelFormat);\n> +\t\t\t\tconfig.outputSizes = converter->sizes(format.size);\n>  \t\t\t}\n>  \n> -\t\t\tconfig.outputSizes = converter->sizes(format.size);\n> -\n> -\t\t\tfor (PixelFormat fmt : converter->formats(pixelFormat))\n> -\t\t\t\tformats_[fmt] = config;\n> +\t\t\tconfigs_.push_back(config);\n>  \t\t}\n>  \t}\n>  \n> -\tif (formats_.empty()) {\n> +\tif (configs_.empty()) {\n>  \t\tLOG(SimplePipeline, Error) << \"No valid configuration found\";\n>  \t\treturn -EINVAL;\n>  \t}\n>  \n> +\t/*\n> +\t * Map the pixel formats to configurations. Any previously stored value\n> +\t * is overwritten, as the pipeline handler currently doesn't care about\n> +\t * how a particular PixelFormat is achieved.\n> +\t */\n> +\tfor (const Configuration &config : configs_) {\n> +\t\tformats_[config.captureFormat] = &config;\n> +\n> +\t\tfor (PixelFormat fmt : config.outputFormats)\n> +\t\t\tformats_[fmt] = &config;\n> +\t}\n\nPhew, ok, so configs_ never grows or changes after init, and the\nformats_ is generated after the configs_ are prepared. So I think we're\ngood.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> +\n>  \tproperties_ = sensor_->properties();\n>  \n>  \treturn 0;\n> @@ -548,7 +554,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()\n>  \t\tstatus = Adjusted;\n>  \t}\n>  \n> -\tpipeConfig_ = &it->second;\n> +\tpipeConfig_ = it->second;\n>  \tif (!pipeConfig_->outputSizes.contains(cfg.size)) {\n>  \t\tLOG(SimplePipeline, Debug)\n>  \t\t\t<< \"Adjusting size from \" << cfg.size.toString()\n> @@ -614,7 +620,7 @@ CameraConfiguration *SimplePipelineHandler::generateConfiguration(Camera *camera\n>  \t\t       std::inserter(formats, formats.end()),\n>  \t\t       [](const auto &format) -> decltype(formats)::value_type {\n>  \t\t\t       const PixelFormat &pixelFormat = format.first;\n> -\t\t\t       const Size &size = format.second.captureSize;\n> +\t\t\t       const Size &size = format.second->captureSize;\n>  \t\t\t       return { pixelFormat, { size } };\n>  \t\t       });\n>  \n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 34F18BD1F1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue,  2 Mar 2021 10:18:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F40A668A97;\n\tTue,  2 Mar 2021 11:18:00 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EF99660106\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  2 Mar 2021 11:17:59 +0100 (CET)","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 93DCF45D;\n\tTue,  2 Mar 2021 11:17:59 +0100 (CET)"],"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=\"naj7lwYy\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1614680279;\n\tbh=uBuYOWDuEIqbIciYqzhjbKsKeTdKjqJFDJMFTRVDJVs=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=naj7lwYyYjcMnlSNDlIIGsW3hFtee596Wt8muMSpegeTZWMHn/t3KkBDcNmz+ez4T\n\twi7a4AJsczQCRASUxu+CmeTrCvJ8274OJqFYi2MS8uoXLDwdc/ofyP6l+BjW0BCADN\n\t0uaV/8vLEKxr5oPOlukbGZD56V+1SkVwVMpTmswk=","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>\n\t<20210131224702.8838-16-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<b9574387-e562-bdb8-b3aa-2f9c6bddd690@ideasonboard.com>","Date":"Tue, 2 Mar 2021 10:17:56 +0000","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":"<20210131224702.8838-16-laurent.pinchart@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 15/20] libcamera: pipeline: simple:\n\tAdd output formats to Configuration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"Phi-Bang Nguyen <pnguyen@baylibre.com>","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]