[{"id":12776,"web_url":"https://patchwork.libcamera.org/comment/12776/","msgid":"<20200925150723.qahly2oxx3e7dlhp@uno.localdomain>","date":"2020-09-25T15:07:23","subject":"Re: [libcamera-devel] [PATCH v3 14/22] libcamera: pipeline: rkisp1:\n\tExpose self path stream","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Niklas,\n\nOn Fri, Sep 25, 2020 at 03:41:59AM +0200, Niklas Söderlund wrote:\n> Expose the self stream to applications and prefers it for the viewfinder\n> and video roles as it can be extended to produce RGB. Keep preferring\n> the main path for still capture as it could be extended to support RAW\n> formats which makes most sense for still capture.\n>\n> With this change the self path becomes available to applications and a\n> camera backed by this pipeline can produce two streams simultaneously.\n>\n> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> ---\n> * Changes since v2\n> - Rework generation logic to grantee a stream is not picked for both\n>   roles.\n> ---\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 55 +++++++++++++++++++-----\n>  1 file changed, 45 insertions(+), 10 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index bd53183a034efaff..27a3c44da3805c5f 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -718,17 +718,49 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n>  \tif (roles.empty())\n>  \t\treturn config;\n\nShould roles be capped to 2 ?\n\n>\n> -\tstd::map<PixelFormat, std::vector<SizeRange>> streamFormats;\n> -\tfor (const PixelFormat &format : RKISP1_RSZ_MP_FORMATS)\n> -\t\tstreamFormats[format] =\n> -\t\t\t{ { RKISP1_RSZ_MP_SRC_MIN, data->sensor_->resolution() } };\n> +\tbool mainPathAvailable = true;\n> +\tbool selfPathAvailable = true;\n> +\tfor (const StreamRole role : roles) {\n> +\t\tbool useMainPath;\n>\n> -\tStreamFormats formats(streamFormats);\n> -\tStreamConfiguration cfg(formats);\n> -\tcfg.pixelFormat = formats::NV12;\n> -\tcfg.size = data->sensor_->resolution();\n> +\t\tswitch (role) {\n> +\t\tcase StreamRole::StillCapture: {\n> +\t\t\tuseMainPath = mainPathAvailable;\n> +\t\t\tbreak;\n> +\t\t}\n> +\t\tcase StreamRole::Viewfinder:\n> +\t\tcase StreamRole::VideoRecording: {\n> +\t\t\tuseMainPath = !selfPathAvailable;\n> +\t\t\tbreak;\n> +\t\t}\n\nDo you need to restrict the scope ?\n\n> +\t\tdefault:\n> +\t\t\tLOG(RkISP1, Warning)\n> +\t\t\t\t<< \"Requested stream role not supported: \" << role;\n> +\t\t\tdelete config;\n> +\t\t\treturn nullptr;\n> +\t\t}\n>\n> -\tconfig->addConfiguration(cfg);\n> +\t\tstd::map<PixelFormat, std::vector<SizeRange>> streamFormats;\n> +\t\tif (useMainPath) {\n> +\t\t\tmainPathAvailable = false;\n> +\t\t\tfor (const PixelFormat &format : RKISP1_RSZ_MP_FORMATS)\n> +\t\t\t\tstreamFormats[format] =\n> +\t\t\t\t{ { RKISP1_RSZ_MP_SRC_MIN, data->sensor_->resolution() } };\n> +\t\t} else {\n> +\t\t\tselfPathAvailable = false;\n> +\t\t\tfor (const PixelFormat &format : RKISP1_RSZ_SP_FORMATS)\n> +\t\t\t\tstreamFormats[format] =\n> +\t\t\t\t{ { RKISP1_RSZ_SP_SRC_MIN, data->sensor_->resolution() } };\n\nShouldn't this be\n\n\t\t\t\t{ { RKISP1_RSZ_SP_SRC_MIN,\n                                    std:min(data->sensor_->resolution(),\n                                            RKISP1_RSZ_SP_SRC_MAX} };\n\nSame above\n\nThis apart\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n  j\n\n> +\t\t}\n> +\n> +\t\tStreamFormats formats(streamFormats);\n> +\t\tStreamConfiguration cfg(formats);\n> +\t\tcfg.pixelFormat = formats::NV12;\n> +\t\tcfg.size = data->sensor_->resolution();\n> +\t\tcfg.bufferCount = 4;\n> +\n> +\t\tconfig->addConfiguration(cfg);\n> +\t}\n>\n>  \tconfig->validate();\n>\n> @@ -1216,7 +1248,10 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n>  \tif (ret)\n>  \t\treturn ret;\n>\n> -\tstd::set<Stream *> streams{ &data->mainPathStream_ };\n> +\tstd::set<Stream *> streams{\n> +\t\t&data->mainPathStream_,\n> +\t\t&data->selfPathStream_,\n> +\t};\n>  \tstd::shared_ptr<Camera> camera =\n>  \t\tCamera::create(this, data->sensor_->id(), streams);\n>  \tregisterCamera(std::move(camera), std::move(data));\n> --\n> 2.28.0\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 93FBEC3B5C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 25 Sep 2020 15:03:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 090A063050;\n\tFri, 25 Sep 2020 17:03:34 +0200 (CEST)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E273962FD8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Sep 2020 17:03:31 +0200 (CEST)","from uno.localdomain (host-87-18-63-10.retail.telecomitalia.it\n\t[87.18.63.10]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id CFD88240009;\n\tFri, 25 Sep 2020 15:03:30 +0000 (UTC)"],"Date":"Fri, 25 Sep 2020 17:07:23 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Niklas =?utf-8?q?S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","Message-ID":"<20200925150723.qahly2oxx3e7dlhp@uno.localdomain>","References":"<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>\n\t<20200925014207.1455796-15-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200925014207.1455796-15-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH v3 14/22] libcamera: pipeline: rkisp1:\n\tExpose self path stream","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":"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\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":12785,"web_url":"https://patchwork.libcamera.org/comment/12785/","msgid":"<20200925165020.GG1757254@oden.dyn.berto.se>","date":"2020-09-25T16:50:20","subject":"Re: [libcamera-devel] [PATCH v3 14/22] libcamera: pipeline: rkisp1:\n\tExpose self path stream","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nOn 2020-09-25 17:07:23 +0200, Jacopo Mondi wrote:\n> Hi Niklas,\n> \n> On Fri, Sep 25, 2020 at 03:41:59AM +0200, Niklas Söderlund wrote:\n> > Expose the self stream to applications and prefers it for the viewfinder\n> > and video roles as it can be extended to produce RGB. Keep preferring\n> > the main path for still capture as it could be extended to support RAW\n> > formats which makes most sense for still capture.\n> >\n> > With this change the self path becomes available to applications and a\n> > camera backed by this pipeline can produce two streams simultaneously.\n> >\n> > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> > ---\n> > * Changes since v2\n> > - Rework generation logic to grantee a stream is not picked for both\n> >   roles.\n> > ---\n> >  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 55 +++++++++++++++++++-----\n> >  1 file changed, 45 insertions(+), 10 deletions(-)\n> >\n> > diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > index bd53183a034efaff..27a3c44da3805c5f 100644\n> > --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> > @@ -718,17 +718,49 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n> >  \tif (roles.empty())\n> >  \t\treturn config;\n> \n> Should roles be capped to 2 ?\n\nThis is handled in Camera::generateConfiguration().\n\n> \n> >\n> > -\tstd::map<PixelFormat, std::vector<SizeRange>> streamFormats;\n> > -\tfor (const PixelFormat &format : RKISP1_RSZ_MP_FORMATS)\n> > -\t\tstreamFormats[format] =\n> > -\t\t\t{ { RKISP1_RSZ_MP_SRC_MIN, data->sensor_->resolution() } };\n> > +\tbool mainPathAvailable = true;\n> > +\tbool selfPathAvailable = true;\n> > +\tfor (const StreamRole role : roles) {\n> > +\t\tbool useMainPath;\n> >\n> > -\tStreamFormats formats(streamFormats);\n> > -\tStreamConfiguration cfg(formats);\n> > -\tcfg.pixelFormat = formats::NV12;\n> > -\tcfg.size = data->sensor_->resolution();\n> > +\t\tswitch (role) {\n> > +\t\tcase StreamRole::StillCapture: {\n> > +\t\t\tuseMainPath = mainPathAvailable;\n> > +\t\t\tbreak;\n> > +\t\t}\n> > +\t\tcase StreamRole::Viewfinder:\n> > +\t\tcase StreamRole::VideoRecording: {\n> > +\t\t\tuseMainPath = !selfPathAvailable;\n> > +\t\t\tbreak;\n> > +\t\t}\n> \n> Do you need to restrict the scope ?\n> \n> > +\t\tdefault:\n> > +\t\t\tLOG(RkISP1, Warning)\n> > +\t\t\t\t<< \"Requested stream role not supported: \" << role;\n> > +\t\t\tdelete config;\n> > +\t\t\treturn nullptr;\n> > +\t\t}\n> >\n> > -\tconfig->addConfiguration(cfg);\n> > +\t\tstd::map<PixelFormat, std::vector<SizeRange>> streamFormats;\n> > +\t\tif (useMainPath) {\n> > +\t\t\tmainPathAvailable = false;\n> > +\t\t\tfor (const PixelFormat &format : RKISP1_RSZ_MP_FORMATS)\n> > +\t\t\t\tstreamFormats[format] =\n> > +\t\t\t\t{ { RKISP1_RSZ_MP_SRC_MIN, data->sensor_->resolution() } };\n> > +\t\t} else {\n> > +\t\t\tselfPathAvailable = false;\n> > +\t\t\tfor (const PixelFormat &format : RKISP1_RSZ_SP_FORMATS)\n> > +\t\t\t\tstreamFormats[format] =\n> > +\t\t\t\t{ { RKISP1_RSZ_SP_SRC_MIN, data->sensor_->resolution() } };\n> \n> Shouldn't this be\n> \n> \t\t\t\t{ { RKISP1_RSZ_SP_SRC_MIN,\n>                                     std:min(data->sensor_->resolution(),\n>                                             RKISP1_RSZ_SP_SRC_MAX} };\n\nYou are correct, I do this when I refactor way this to RkISP1Path but \nnot here. Will fix.\n\n> \n> Same above\n> \n> This apart\n> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n> \n> Thanks\n>   j\n> \n> > +\t\t}\n> > +\n> > +\t\tStreamFormats formats(streamFormats);\n> > +\t\tStreamConfiguration cfg(formats);\n> > +\t\tcfg.pixelFormat = formats::NV12;\n> > +\t\tcfg.size = data->sensor_->resolution();\n> > +\t\tcfg.bufferCount = 4;\n> > +\n> > +\t\tconfig->addConfiguration(cfg);\n> > +\t}\n> >\n> >  \tconfig->validate();\n> >\n> > @@ -1216,7 +1248,10 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n> >  \tif (ret)\n> >  \t\treturn ret;\n> >\n> > -\tstd::set<Stream *> streams{ &data->mainPathStream_ };\n> > +\tstd::set<Stream *> streams{\n> > +\t\t&data->mainPathStream_,\n> > +\t\t&data->selfPathStream_,\n> > +\t};\n> >  \tstd::shared_ptr<Camera> camera =\n> >  \t\tCamera::create(this, data->sensor_->id(), streams);\n> >  \tregisterCamera(std::move(camera), std::move(data));\n> > --\n> > 2.28.0\n> >\n> > _______________________________________________\n> > libcamera-devel mailing list\n> > libcamera-devel@lists.libcamera.org\n> > https://lists.libcamera.org/listinfo/libcamera-devel","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 4EA6AC3B5C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 25 Sep 2020 16:50:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CA13E6303C;\n\tFri, 25 Sep 2020 18:50:23 +0200 (CEST)","from mail-lj1-x232.google.com (mail-lj1-x232.google.com\n\t[IPv6:2a00:1450:4864:20::232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6324D62FD8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Sep 2020 18:50:22 +0200 (CEST)","by mail-lj1-x232.google.com with SMTP id c2so2984921ljj.12\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Sep 2020 09:50:22 -0700 (PDT)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tc198sm2641396lfd.228.2020.09.25.09.50.21\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 25 Sep 2020 09:50:21 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"IVmc4cI+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=wKBvhdYlVw5dNuo1z+cR7qdaFxjz1G96CNqhQWf4EOI=;\n\tb=IVmc4cI+Rg7dlteKcXeTs1enqTTDWGcPdSeseHlP42WAn6bgW5/MvFfzxbae8EZPGo\n\txvHoBn9u2YFFxJYeAEiuhKdw/LX350XYv0sL75ALd9IxVXdt4YL15LwRLW9mHwR/LXik\n\tCyvUlYT8q5qe2KeHsozbJvmKiHDqEQzPa77NA1oEIfpZdXc+MClodEMdBHpWeOsIwkjj\n\tkviXbjNnU8ZuKZHyopEq181XxLWgvcvjXF74nMVVVvXi2PIMmzcI6YSyDZQ61IcIHND9\n\t0iCnq4bIAa4E7kZTp1/79MX15rj2V25Qu+H5COJEe5yNOxub9ImibHtD8M/DG8kxYt3Z\n\t/SHA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=wKBvhdYlVw5dNuo1z+cR7qdaFxjz1G96CNqhQWf4EOI=;\n\tb=p6zw4cFfqB/JDNf7UDc5fsalc4vQfNACSTVbEAOJWJa39UUR0HhnppGDaGeP9tmtSM\n\tvRgMY9VkZQEGDzXnahcsUDgm1o1ED2NWsxb/df/jqnkzEQbDyhT3uIgXpJvCPGEopBnH\n\tAIz7eM9nFm1XfEzP16pyVJ3WXv/nDqLSr7XLTffNw3NBKOKQPrX9TeAmYBJ+YV1m01nt\n\tQMJLaKwQiNiI+K7BZ5Ace0Nectliql//8VB1lPh0XFQNPBZ+d5c3bYCn4Beo83NW5Pqe\n\tLXItdxK61uKjT9+Qkt9m05RpyFoARxgnN8fgnkTG0NYRuKCiHRk6NMEPbgT3mf1stfqJ\n\thoDQ==","X-Gm-Message-State":"AOAM5327VguMBhfJmap/IAnSMrMC0ETJYHsbAuLZvmUa9dwv/9VYHm6N\n\tYUeiVynfAPFm9MlB8cEwKHhm21nrMEalMQ==","X-Google-Smtp-Source":"ABdhPJyXYHoDx/9x/nYMFiDB6s3pUlLtbifhafZEiOnSJh60LWwQE553upaDCjsa39TIJnAIYpYtUg==","X-Received":"by 2002:a05:651c:1248:: with SMTP id\n\th8mr1784968ljh.225.1601052621693; \n\tFri, 25 Sep 2020 09:50:21 -0700 (PDT)","Date":"Fri, 25 Sep 2020 18:50:20 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Jacopo Mondi <jacopo@jmondi.org>","Message-ID":"<20200925165020.GG1757254@oden.dyn.berto.se>","References":"<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>\n\t<20200925014207.1455796-15-niklas.soderlund@ragnatech.se>\n\t<20200925150723.qahly2oxx3e7dlhp@uno.localdomain>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200925150723.qahly2oxx3e7dlhp@uno.localdomain>","Subject":"Re: [libcamera-devel] [PATCH v3 14/22] libcamera: pipeline: rkisp1:\n\tExpose self path stream","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":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":12825,"web_url":"https://patchwork.libcamera.org/comment/12825/","msgid":"<20200928203955.GQ23539@pendragon.ideasonboard.com>","date":"2020-09-28T20:39:55","subject":"Re: [libcamera-devel] [PATCH v3 14/22] libcamera: pipeline: rkisp1:\n\tExpose self path stream","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Fri, Sep 25, 2020 at 03:41:59AM +0200, Niklas Söderlund wrote:\n> Expose the self stream to applications and prefers it for the viewfinder\n> and video roles as it can be extended to produce RGB. Keep preferring\n> the main path for still capture as it could be extended to support RAW\n> formats which makes most sense for still capture.\n> \n> With this change the self path becomes available to applications and a\n> camera backed by this pipeline can produce two streams simultaneously.\n> \n> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n> ---\n> * Changes since v2\n> - Rework generation logic to grantee a stream is not picked for both\n>   roles.\n> ---\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 55 +++++++++++++++++++-----\n>  1 file changed, 45 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index bd53183a034efaff..27a3c44da3805c5f 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -718,17 +718,49 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n>  \tif (roles.empty())\n>  \t\treturn config;\n>  \n> -\tstd::map<PixelFormat, std::vector<SizeRange>> streamFormats;\n> -\tfor (const PixelFormat &format : RKISP1_RSZ_MP_FORMATS)\n> -\t\tstreamFormats[format] =\n> -\t\t\t{ { RKISP1_RSZ_MP_SRC_MIN, data->sensor_->resolution() } };\n> +\tbool mainPathAvailable = true;\n> +\tbool selfPathAvailable = true;\n> +\tfor (const StreamRole role : roles) {\n> +\t\tbool useMainPath;\n>  \n> -\tStreamFormats formats(streamFormats);\n> -\tStreamConfiguration cfg(formats);\n> -\tcfg.pixelFormat = formats::NV12;\n> -\tcfg.size = data->sensor_->resolution();\n> +\t\tswitch (role) {\n> +\t\tcase StreamRole::StillCapture: {\n> +\t\t\tuseMainPath = mainPathAvailable;\n> +\t\t\tbreak;\n> +\t\t}\n> +\t\tcase StreamRole::Viewfinder:\n> +\t\tcase StreamRole::VideoRecording: {\n> +\t\t\tuseMainPath = !selfPathAvailable;\n> +\t\t\tbreak;\n> +\t\t}\n> +\t\tdefault:\n> +\t\t\tLOG(RkISP1, Warning)\n> +\t\t\t\t<< \"Requested stream role not supported: \" << role;\n> +\t\t\tdelete config;\n> +\t\t\treturn nullptr;\n> +\t\t}\n>  \n> -\tconfig->addConfiguration(cfg);\n> +\t\tstd::map<PixelFormat, std::vector<SizeRange>> streamFormats;\n> +\t\tif (useMainPath) {\n> +\t\t\tmainPathAvailable = false;\n> +\t\t\tfor (const PixelFormat &format : RKISP1_RSZ_MP_FORMATS)\n> +\t\t\t\tstreamFormats[format] =\n> +\t\t\t\t{ { RKISP1_RSZ_MP_SRC_MIN, data->sensor_->resolution() } };\n\nOne more indentation level is needed. You can write it as\n\n\t\t\t\tstreamFormats[format] = { {\n\t\t\t\t\tRKISP1_RSZ_MP_SRC_MIN,\n\t\t\t\t\tdata->sensor_->resolution()\n\t\t\t\t} };\n\nfor instance if you want to keep lines short.\n\nAs Jacopo pointed out, sensor_->resolution() needs to be capped to the\nmaximum supported size.\n\nWith this addressed,\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> +\t\t} else {\n> +\t\t\tselfPathAvailable = false;\n> +\t\t\tfor (const PixelFormat &format : RKISP1_RSZ_SP_FORMATS)\n> +\t\t\t\tstreamFormats[format] =\n> +\t\t\t\t{ { RKISP1_RSZ_SP_SRC_MIN, data->sensor_->resolution() } };\n> +\t\t}\n> +\n> +\t\tStreamFormats formats(streamFormats);\n> +\t\tStreamConfiguration cfg(formats);\n> +\t\tcfg.pixelFormat = formats::NV12;\n> +\t\tcfg.size = data->sensor_->resolution();\n> +\t\tcfg.bufferCount = 4;\n> +\n> +\t\tconfig->addConfiguration(cfg);\n> +\t}\n>  \n>  \tconfig->validate();\n>  \n> @@ -1216,7 +1248,10 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n>  \tif (ret)\n>  \t\treturn ret;\n>  \n> -\tstd::set<Stream *> streams{ &data->mainPathStream_ };\n> +\tstd::set<Stream *> streams{\n> +\t\t&data->mainPathStream_,\n> +\t\t&data->selfPathStream_,\n> +\t};\n>  \tstd::shared_ptr<Camera> camera =\n>  \t\tCamera::create(this, data->sensor_->id(), streams);\n>  \tregisterCamera(std::move(camera), std::move(data));","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 C4E1AC3B5B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 28 Sep 2020 20:40:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2A81560BF7;\n\tMon, 28 Sep 2020 22:40:33 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4AAB760366\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 28 Sep 2020 22:40:32 +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 4E12CA58;\n\tMon, 28 Sep 2020 22:40: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=\"GqeqaKIF\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601325630;\n\tbh=Xh04epeSrMfVoYquzdVcjdTMsjP+Xik42VAMmkH3T74=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=GqeqaKIF/BFvlyZeiaU2m73VdrBtUWPRj6r9vOZG4jLeXVKpLhG5OVSwn0hoE3O+q\n\tWMdrcaCZVwkhj/C6QXuxox29Cb3mkiib0lwfP/QnJNXOtugVDFEwIxZLS/UroHyPT/\n\tm+geaf9qHqCzpERQdVdlpRT6nSq4F+lHVZBGRNsE=","Date":"Mon, 28 Sep 2020 23:39:55 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Niklas =?utf-8?q?S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>","Message-ID":"<20200928203955.GQ23539@pendragon.ideasonboard.com>","References":"<20200925014207.1455796-1-niklas.soderlund@ragnatech.se>\n\t<20200925014207.1455796-15-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200925014207.1455796-15-niklas.soderlund@ragnatech.se>","Subject":"Re: [libcamera-devel] [PATCH v3 14/22] libcamera: pipeline: rkisp1:\n\tExpose self path stream","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":"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\" <libcamera-devel-bounces@lists.libcamera.org>"}}]