[{"id":2268,"web_url":"https://patchwork.libcamera.org/comment/2268/","msgid":"<20190714110136.GM31102@wyvern>","date":"2019-07-14T11:01:36","subject":"Re: [libcamera-devel] [PATCH v2 15/16] libcamera: pipeline: Support\n\timporting buffers","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo, Laurent,\n\nThanks for your patch.\n\nOn 2019-07-13 20:23:50 +0300, Laurent Pinchart wrote:\n> From: Jacopo Mondi \n> \n> Add support for importing external buffers in all pipeline handlers.\n> \n> Use the stream memory type in the pipeline handlers during buffer\n> allocation to import buffers to or export buffers from the video device.\n> \n> Signed-off-by: Jacopo Mondi \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 49 ++++++++++++++++++------\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 ++-\n> src/libcamera/pipeline/uvcvideo.cpp | 5 ++-\n> src/libcamera/pipeline/vimc.cpp | 5 ++-\n> 4 files changed, 51 insertions(+), 14 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 488e89f25c5e..9ac5a5387dec 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -69,8 +69,9 @@ public:\n> \tint configureOutput(ImgUOutput *output,\n> \t\t\t const StreamConfiguration &cfg);\n> \n> -\tint importBuffers(BufferPool *pool);\n> -\tint exportBuffers(ImgUOutput *output, BufferPool *pool);\n> +\tint importInputBuffers(BufferPool *pool);\n> +\tint importOutputBuffers(ImgUOutput *output, BufferPool *pool);\n> +\tint exportOutputBuffers(ImgUOutput *output, BufferPool *pool);\n> \tvoid freeBuffers();\n> \n> \tint start();\n> @@ -605,7 +606,7 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n> \tif (!pool)\n> \t\treturn -ENOMEM;\n> \n> -\tret = imgu->importBuffers(pool);\n> +\tret = imgu->importInputBuffers(pool);\n> \tif (ret)\n> \t\tgoto error;\n> \n> @@ -616,7 +617,7 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n> \t */\n> \tbufferCount = pool->count();\n> \timgu->stat_.pool->createBuffers(bufferCount);\n> -\tret = imgu->exportBuffers(&imgu->stat_, imgu->stat_.pool);\n> +\tret = imgu->exportOutputBuffers(&imgu->stat_, imgu->stat_.pool);\n> \tif (ret)\n> \t\tgoto error;\n> \n> @@ -625,7 +626,10 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n> \t\tIPU3Stream *stream = static_cast(s);\n> \t\tImgUDevice::ImgUOutput *dev = stream->device_;\n> \n> -\t\tret = imgu->exportBuffers(dev, &stream->bufferPool());\n> +\t\tif (stream->memoryType() == InternalMemory)\n> +\t\t\tret = imgu->exportOutputBuffers(dev, &stream->bufferPool());\n> +\t\telse\n> +\t\t\tret = imgu->importOutputBuffers(dev, &stream->bufferPool());\n> \t\tif (ret)\n> \t\t\tgoto error;\n> \t}\n> @@ -637,8 +641,8 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n> \tif (!outStream->active_) {\n> \t\tbufferCount = vfStream->configuration().bufferCount;\n> \t\toutStream->device_->pool->createBuffers(bufferCount);\n> -\t\tret = imgu->exportBuffers(outStream->device_,\n> -\t\t\t\t\t outStream->device_->pool);\n> +\t\tret = imgu->exportOutputBuffers(outStream->device_,\n> +\t\t\t\t\t\toutStream->device_->pool);\n> \t\tif (ret)\n> \t\t\tgoto error;\n> \t}\n> @@ -646,8 +650,8 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n> \tif (!vfStream->active_) {\n> \t\tbufferCount = outStream->configuration().bufferCount;\n> \t\tvfStream->device_->pool->createBuffers(bufferCount);\n> -\t\tret = imgu->exportBuffers(vfStream->device_,\n> -\t\t\t\t\t vfStream->device_->pool);\n> +\t\tret = imgu->exportOutputBuffers(vfStream->device_,\n> +\t\t\t\t\t\tvfStream->device_->pool);\n> \t\tif (ret)\n> \t\t\tgoto error;\n> \t}\n> @@ -1113,7 +1117,7 @@ int ImgUDevice::configureOutput(ImgUOutput *output,\n> * \\param[in] pool The buffer pool to import\n> * \\return 0 on success or a negative error code otherwise\n> */\n> -int ImgUDevice::importBuffers(BufferPool *pool)\n> +int ImgUDevice::importInputBuffers(BufferPool *pool)\n> {\n> \tint ret = input_->importBuffers(pool);\n> \tif (ret) {\n> @@ -1134,7 +1138,7 @@ int ImgUDevice::importBuffers(BufferPool *pool)\n> *\n> * \\return 0 on success or a negative error code otherwise\n> */\n> -int ImgUDevice::exportBuffers(ImgUOutput *output, BufferPool *pool)\n> +int ImgUDevice::exportOutputBuffers(ImgUOutput *output, BufferPool *pool)\n> {\n> \tint ret = output->dev->exportBuffers(pool);\n> \tif (ret) {\n> @@ -1146,6 +1150,29 @@ int ImgUDevice::exportBuffers(ImgUOutput *output, BufferPool *pool)\n> \treturn 0;\n> }\n> \n> +/**\n> + * \\brief Reserve buffers in \\a output from the provided \\a pool\n> + * \\param[in] output The ImgU output device\n> + * \\param[in] pool The buffer pool used to reserve buffers in \\a output\n> + *\n> + * Reserve a number of buffers equal to the number of buffers in \\a pool\n> + * in the \\a output device.\n> + *\n> + * \\return 0 on success or a negative error code otherwise\n> + */\n> +int ImgUDevice::importOutputBuffers(ImgUOutput *output, BufferPool *pool)\n> +{\n> +\tint ret = output->dev->importBuffers(pool);\n> +\tif (ret) {\n> +\t\tLOG(IPU3, Error)\n> +\t\t\t<< \"Failed to import buffer in \" << output->name\n> +\t\t\t<< \" ImgU device\";\n> +\t\treturn ret;\n> +\t}\n> +\n> +\treturn 0;\n> +}\n> +\n> /**\n> * \\brief Release buffers for all the ImgU video devices\n> */\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index cc33a2cb2572..efa9604bc1e3 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -319,7 +319,11 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera,\n> \t\t\t\t\t const std::set &streams)\n> {\n> \tStream *stream = *streams.begin();\n> -\treturn video_->exportBuffers(&stream->bufferPool());\n> +\n> +\tif (stream->memoryType() == InternalMemory)\n> +\t\treturn video_->exportBuffers(&stream->bufferPool());\n> +\telse\n> +\t\treturn video_->importBuffers(&stream->bufferPool());\n> }\n> \n> int PipelineHandlerRkISP1::freeBuffers(Camera *camera,\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index b299c5da8471..8965210550d2 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -200,7 +200,10 @@ int PipelineHandlerUVC::allocateBuffers(Camera *camera,\n> \n> \tLOG(UVC, Debug) << \"Requesting \" << cfg.bufferCount << \" buffers\";\n> \n> -\treturn data->video_->exportBuffers(&stream->bufferPool());\n> +\tif (stream->memoryType() == InternalMemory)\n> +\t\treturn data->video_->exportBuffers(&stream->bufferPool());\n> +\telse\n> +\t\treturn data->video_->importBuffers(&stream->bufferPool());\n> }\n> \n> int PipelineHandlerUVC::freeBuffers(Camera *camera,\n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index 7d96c3645c06..61b68a32ea50 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -202,7 +202,10 @@ int PipelineHandlerVimc::allocateBuffers(Camera *camera,\n> \n> \tLOG(VIMC, Debug) << \"Requesting \" << cfg.bufferCount << \" buffers\";\n> \n> -\treturn data->video_->exportBuffers(&stream->bufferPool());\n> +\tif (stream->memoryType() == InternalMemory)\n> +\t\treturn data->video_->exportBuffers(&stream->bufferPool());\n> +\telse\n> +\t\treturn data->video_->importBuffers(&stream->bufferPool());\n> }\n> \n> int PipelineHandlerVimc::freeBuffers(Camera *camera,\n> -- \n> Regards,\n> \n> Laurent Pinchart\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-pg1-x541.google.com (mail-pg1-x541.google.com\n\t[IPv6:2607:f8b0:4864:20::541])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 90E9561572\n\tfor ;\n\tSun, 14 Jul 2019 13:01:42 +0200 (CEST)","by mail-pg1-x541.google.com with SMTP id m4so6418616pgk.0\n\tfor ;\n\tSun, 14 Jul 2019 04:01:42 -0700 (PDT)","from localhost (softbank126159224182.bbtec.net. [126.159.224.182])\n\tby smtp.gmail.com with ESMTPSA id\n\th70sm8397412pgc.36.2019.07.14.04.01.40\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tSun, 14 Jul 2019 04:01:40 -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=1d3jzmM/Y+3btQj1Ugn3VsiJNf27guqJF6Goh9cX1Ak=;\n\tb=gGhgm/i0VCcpIVatLBkpYd9PDd9/CCXkbMTq3JWSQflCkX494TKfyL656tqhrNQyHs\n\tPzKnYPO4X3y7oUGO8Zyz/SEHmtc2qQoiFSpOyYOTHPUahEyblkwd3sYNptk0BFg+VE+r\n\tlGrqpxfAtTM4Ev5WJ314smI9/oXY3Ju1xTQIGuB7l8gwFWZJPADcHYgVd7Ne0ifzOB0K\n\tNqiWTZaBwb7eEztEVjGoKecKs4cRNYnKTxstDtDubIE7+2f4c3h2BgoI1HQ+zm4Dyayc\n\tadV9mBpVLNq3xzEymUuPAcq5ybIHD6FQJJ1xNfK8Atxk/HBibCk7Bu2orQLIQQvctilj\n\tnBuw==","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=1d3jzmM/Y+3btQj1Ugn3VsiJNf27guqJF6Goh9cX1Ak=;\n\tb=LQS7yheNIbc6uTS5YElrHESymUjYLPDdLRsbhGNGDO29XL5W1XYC/EpaSWk8/VhsTm\n\tYtgd2qPe16J9OtJ9M2eqFBdoKSt2fw4G9XUMt99q8673byTm6I/tMj97pNL2fNgRP+B8\n\tCuaygMFCvijDi+PGBaw4jXXKQQBhltK2M2mQRiPo7InutlH0nz69yKT9JvRUjV8W0zco\n\t25zhTW2osamIf649cmC0aRfmIK4djICaw3w3NVa8fCaitPYpxrdP/2F+Cr9xH9ALSBPF\n\tVy1YtnySj+ZTuEPBcrk/Lay/V3XJyHildY/PA/X+7EEyR+Bx7L4royFFqXi4zZ7YHl+n\n\ttxng==","X-Gm-Message-State":"APjAAAW0pALEpeg7iTdy0gpDqV4ANCV/b9cuVTqDPX5wubPeKiVVehmm\n\tR5wpb49lM8fttbMVmuLr37w=","X-Google-Smtp-Source":"APXvYqwAQue7Gfgn55uhsAgHDeFbnlRwBsCOQQq5+6+h8xe+I9vFp41Am/wvJ+i9sqv4RyWWBjmZNg==","X-Received":"by 2002:a17:90a:8c06:: with SMTP id\n\ta6mr23471608pjo.45.1563102101313; \n\tSun, 14 Jul 2019 04:01:41 -0700 (PDT)","Date":"Sun, 14 Jul 2019 20:01:36 +0900","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190714110136.GM31102@wyvern>","References":"<20190713172351.25452-1-laurent.pinchart@ideasonboard.com>\n\t<20190713172351.25452-16-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190713172351.25452-16-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH v2 15/16] libcamera: pipeline: Support\n\timporting buffers","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":"Sun, 14 Jul 2019 11:01:43 -0000"}}]