[{"id":1466,"web_url":"https://patchwork.libcamera.org/comment/1466/","msgid":"<20190418204139.GC4794@pendragon.ideasonboard.com>","date":"2019-04-18T20:41:39","subject":"Re: [libcamera-devel] [PATCH v6 4/6] libcamera: ipu3: Queue\n\trequests for multiple streams","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo,\n\nThank you for the patch.\n\nOn Thu, Apr 18, 2019 at 06:46:36PM +0200, Jacopo Mondi wrote:\n> Add support for queueing requests for multiple streams in the IPU3\n> pipeline handler class. The output video node should be queued with\n> buffers even if not part of the requested streams.\n\nIs this still the case ?\n\n> Signed-off-by: Jacopo Mondi \n> ---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 23 +++++++++--------------\n> 1 file changed, 9 insertions(+), 14 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index d14ba47e1c2c..8353272642bd 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -545,25 +545,20 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n> \n> int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n> {\n> -\tIPU3CameraData *data = cameraData(camera);\n> -\tV4L2Device *output = data->imgu_->output_.dev;\n> -\tIPU3Stream *stream = &data->outStream_;\n> +\tint ret = 0;\n> \n> -\t/* Queue a buffer to the ImgU output for capture. */\n> -\tBuffer *buffer = request->findBuffer(stream);\n> -\tif (!buffer) {\n> -\t\tLOG(IPU3, Error)\n> -\t\t\t<< \"Attempt to queue request with invalid stream\";\n> -\t\treturn -ENOENT;\n> -\t}\n> +\tfor (auto it : request->buffers()) {\n> +\t\tIPU3Stream *stream = static_cast(it.first);\n> +\t\tBuffer *buffer = it.second;\n> \n> -\tint ret = output->queueBuffer(buffer);\n> -\tif (ret < 0)\n> -\t\treturn ret;\n> +\t\tint status = stream->device_->dev->queueBuffer(buffer);\n> +\t\tif (status < 0)\n> +\t\t\tret = status;\n\nI'd rather s/ret/error/ and s/status/ret/ as ret is a very common name\nfor temporary return values. Or possibly just swap ret and status.\n\nReviewed-by: Laurent Pinchart \n\n> +\t}\n> \n> \tPipelineHandler::queueRequest(camera, request);\n> \n> -\treturn 0;\n> +\treturn ret;\n> }\n> \n> bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3DAF5600F9\n\tfor ;\n\tThu, 18 Apr 2019 22:41:48 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A9F83333;\n\tThu, 18 Apr 2019 22:41:47 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1555620107;\n\tbh=Fqcj+DWNG5cQTpFDmeebfkCcaeS33G+4MvLf/QfUV7I=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=t7fM5LUhkHxsY08L+H2n4A/isHz/AOosZvzxqwU70v0D7M/VtezkFUO4vKdDSM2Be\n\twKPQRR06kXUHMutb9sU580P9AD1KWWW37io2ZzZgja/ynMAslIQNaQiO4+fb6arY3h\n\tM9ngaZ80lyJBNxaNMV1DzjPxgkktKC8K6hyxWWBo=","Date":"Thu, 18 Apr 2019 23:41:39 +0300","From":"Laurent Pinchart ","To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190418204139.GC4794@pendragon.ideasonboard.com>","References":"<20190418164638.400-1-jacopo@jmondi.org>\n\t<20190418164638.400-5-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190418164638.400-5-jacopo@jmondi.org>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v6 4/6] libcamera: ipu3: Queue\n\trequests for multiple streams","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 18 Apr 2019 20:41:48 -0000"}},{"id":1470,"web_url":"https://patchwork.libcamera.org/comment/1470/","msgid":"<20190419064757.y3dhdwmnvgbksns7@uno.localdomain>","date":"2019-04-19T06:47:57","subject":"Re: [libcamera-devel] [PATCH v6 4/6] libcamera: ipu3: Queue\n\trequests for multiple streams","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Thu, Apr 18, 2019 at 11:41:39PM +0300, Laurent Pinchart wrote:\n> Hi Jacopo,\n>\n> Thank you for the patch.\n>\n> On Thu, Apr 18, 2019 at 06:46:36PM +0200, Jacopo Mondi wrote:\n> > Add support for queueing requests for multiple streams in the IPU3\n> > pipeline handler class. The output video node should be queued with\n> > buffers even if not part of the requested streams.\n>\n> Is this still the case ?\n>\n\nNot anymore. I have not updated the commit message. Sorry about this :(\n\n> > Signed-off-by: Jacopo Mondi \n> > ---\n> > src/libcamera/pipeline/ipu3/ipu3.cpp | 23 +++++++++--------------\n> > 1 file changed, 9 insertions(+), 14 deletions(-)\n> >\n> > diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > index d14ba47e1c2c..8353272642bd 100644\n> > --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> > @@ -545,25 +545,20 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n> >\n> > int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n> > {\n> > -\tIPU3CameraData *data = cameraData(camera);\n> > -\tV4L2Device *output = data->imgu_->output_.dev;\n> > -\tIPU3Stream *stream = &data->outStream_;\n> > +\tint ret = 0;\n> >\n> > -\t/* Queue a buffer to the ImgU output for capture. */\n> > -\tBuffer *buffer = request->findBuffer(stream);\n> > -\tif (!buffer) {\n> > -\t\tLOG(IPU3, Error)\n> > -\t\t\t<< \"Attempt to queue request with invalid stream\";\n> > -\t\treturn -ENOENT;\n> > -\t}\n> > +\tfor (auto it : request->buffers()) {\n> > +\t\tIPU3Stream *stream = static_cast(it.first);\n> > +\t\tBuffer *buffer = it.second;\n> >\n> > -\tint ret = output->queueBuffer(buffer);\n> > -\tif (ret < 0)\n> > -\t\treturn ret;\n> > +\t\tint status = stream->device_->dev->queueBuffer(buffer);\n> > +\t\tif (status < 0)\n> > +\t\t\tret = status;\n>\n> I'd rather s/ret/error/ and s/status/ret/ as ret is a very common name\n> for temporary return values. Or possibly just swap ret and status.\n>\n> Reviewed-by: Laurent Pinchart \n>\n\nThanks\n j\n\n> > +\t}\n> >\n> > \tPipelineHandler::queueRequest(camera, request);\n> >\n> > -\treturn 0;\n> > +\treturn ret;\n> > }\n> >\n> > bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\n>\n> --\n> Regards,\n>\n> Laurent Pinchart","headers":{"Return-Path":"","Received":["from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net\n\t[217.70.183.199])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0447560B1B\n\tfor ;\n\tFri, 19 Apr 2019 08:47:04 +0200 (CEST)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 82AB0FF802;\n\tFri, 19 Apr 2019 06:47:03 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Fri, 19 Apr 2019 08:47:57 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190419064757.y3dhdwmnvgbksns7@uno.localdomain>","References":"<20190418164638.400-1-jacopo@jmondi.org>\n\t<20190418164638.400-5-jacopo@jmondi.org>\n\t<20190418204139.GC4794@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"4ugstzazqds45tf5\"","Content-Disposition":"inline","In-Reply-To":"<20190418204139.GC4794@pendragon.ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH v6 4/6] libcamera: ipu3: Queue\n\trequests for multiple streams","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 19 Apr 2019 06:47:04 -0000"}}]