[{"id":1279,"web_url":"https://patchwork.libcamera.org/comment/1279/","msgid":"<20190405113903.GA23466@bigcity.dyn.berto.se>","date":"2019-04-05T11:39:03","subject":"Re: [libcamera-devel] [PATCH v3 6/8] libcamera: ipu3: Queue request\n\tfor multiple streams","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nThanks for your work.\n\nOn 2019-04-03 17:07:33 +0200, Jacopo Mondi wrote:\n> Add support for queue request on the main and secondary outputs of the\n> ImgU.\n> \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 26 ++++++++++++++------------\n> 1 file changed, 14 insertions(+), 12 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index f7e75fac1dfe..8c67cf985d1e 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -572,20 +572,22 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n> int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n> {\n> \tIPU3CameraData *data = cameraData(camera);\n> -\tV4L2Device *output = data->imgu_->output_.dev;\n> -\tStream *stream = &data->outStream_;\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 (Stream *stream : request->streams()) {\n> +\t\tBuffer *buffer = request->findBuffer(stream);\n\nAs this is in a critical code path I'm not loving how this turned out.\n\nFirst request->streams() iterates Request::bufferMap_ to build a list of \nStreams * which are then yet again used to lookup stuff in the same map. \nWould it not be nicer just to expose Request::bufferMap_ to the pipeline \nhandlers?\n\n> +\t\tif (!buffer) {\n> +\t\t\tLOG(IPU3, Error) << \"Attempt to queue invalid request\";\n> +\t\t\treturn -ENOENT;\n> +\t\t}\n> \n> -\tint ret = output->queueBuffer(buffer);\n> -\tif (ret < 0)\n> -\t\treturn ret;\n> +\t\tV4L2Device *videoDevice = isOutput(data, stream)\n> +\t\t\t\t\t? data->imgu_->output_.dev\n> +\t\t\t\t\t: data->imgu_->viewfinder_.dev;\n> +\n> +\t\tint ret = videoDevice->queueBuffer(buffer);\n> +\t\tif (ret)\n> +\t\t\treturn ret;\n> +\t}\n> \n> \tPipelineHandler::queueRequest(camera, request);\n> \n> -- \n> 2.21.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":"","Received":["from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com\n\t[IPv6:2a00:1450:4864:20::22a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D7C4260DB3\n\tfor ;\n\tFri, 5 Apr 2019 13:39:04 +0200 (CEST)","by mail-lj1-x22a.google.com with SMTP id t4so4975327ljc.2\n\tfor ;\n\tFri, 05 Apr 2019 04:39:04 -0700 (PDT)","from localhost (89-233-230-99.cust.bredband2.com. [89.233.230.99])\n\tby smtp.gmail.com with ESMTPSA id\n\tm28sm4748969lfc.54.2019.04.05.04.39.03\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tFri, 05 Apr 2019 04:39:03 -0700 (PDT)"],"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\t:user-agent; bh=uPdc1qGQaMeRF16Z0VFLCkp/keSfIe/Q9Z3XnqKOW2I=;\n\tb=x3T0aAJlKAndXP7OfrkzJBkSYRrq4ArJNMitmL8q9s/uUGQvOd5cwGD1S8OAqL/SsB\n\thASRW1WpFFyXlPNJnSOgrV0W0tflNvobK7rmUCuB27+MZ/xKopzvWvXGsalgSbQJrQJh\n\tVwtSjIYv9vNSeYbC0qgRzesyC6ZRESHkvh0bsDXKIrV4XmDwLE4mZT3MZG0QptWQaqi9\n\tH/7nYYnTueqgo5En4dCCcJc9WpoqXiU8xzaZssC/FuS3gsR5a25JgXnLCOy6trh418aN\n\tgq2IJj9liTweNkMn56wDGhNL0Vx8nfJSiU8sF1wsdiTXoVcWkXB0JQdGQi7dc6Lykq3F\n\t519w==","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:user-agent;\n\tbh=uPdc1qGQaMeRF16Z0VFLCkp/keSfIe/Q9Z3XnqKOW2I=;\n\tb=igZ+ITrylvRqnOGIPJJvjRgdWEe1DNfStAnn6azP+YQWkpMq8WRP1eu+NgINMKoAjE\n\tJ4xuRa+GrtTujcRtuIxH3KyyFXd6wvAoDl9Hm00Hy3npDKRyqcNodQtsTvkZV5WQaXjm\n\tTjcybFLDdm44Ssa/bOr+OjQbN0dziQkfE0YOCjpXuVAzpaKUkoLcCvXnp89MWygl87fe\n\twJEw4l9JqEHDgD/6eIuVp2iBJW5CwMVHxPb+B9EARAj1N5OixwIqxE3WWnoebHx3MSyn\n\tTXjIh2PhLPcUD5kctChiVvEEd4llxPVnltmxwyzQXMVUUJyGu/JYQEHLGgtj1lFxgQhb\n\tMGzw==","X-Gm-Message-State":"APjAAAXL7W/ffSkypzfrI4bQgr8sHoICEieRMb/u8MSWoEn3TTFkLTsI\n\trXGz+xFTkhR6v+QLgkaoBkTrfw==","X-Google-Smtp-Source":"APXvYqyy0O7IpeKYksS1ZApmQvHBvjqO+W6J71++mEDWfZn/+R0+ifupbvxDmaH1O5XbSjG2UF+CjQ==","X-Received":"by 2002:a2e:884a:: with SMTP id z10mr6628511ljj.21.1554464344333;\n\tFri, 05 Apr 2019 04:39:04 -0700 (PDT)","Date":"Fri, 5 Apr 2019 13:39:03 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190405113903.GA23466@bigcity.dyn.berto.se>","References":"<20190403150735.27580-1-jacopo@jmondi.org>\n\t<20190403150735.27580-7-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190403150735.27580-7-jacopo@jmondi.org>","User-Agent":"Mutt/1.11.3 (2019-02-01)","Subject":"Re: [libcamera-devel] [PATCH v3 6/8] libcamera: ipu3: Queue request\n\tfor 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, 05 Apr 2019 11:39:05 -0000"}}]