{"id":2474,"url":"https://patchwork.libcamera.org/api/1.1/patches/2474/?format=json","web_url":"https://patchwork.libcamera.org/patch/2474/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20191230120510.938333-25-niklas.soderlund@ragnatech.se>","date":"2019-12-30T12:05:09","name":"[libcamera-devel,v2,24/25] libcamera: pipeline: Remove explicit buffer handling","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"9f2776a83f7d50faf15e4f7d8ac8ff4729f58a19","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2474/mbox/","series":[{"id":593,"url":"https://patchwork.libcamera.org/api/1.1/series/593/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=593","date":"2019-12-30T12:04:45","name":"libcamera: Rework buffer API","version":2,"mbox":"https://patchwork.libcamera.org/series/593/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2474/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2474/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 08994605EE\n\tfor ;\n\tMon, 30 Dec 2019 13:06:13 +0100 (CET)","from bismarck.berto.se (p4fca2fd0.dip0.t-ipconnect.de\n\t[79.202.47.208]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid c5b48ad4-2afc-11ea-a00b-005056917a89;\n\tMon, 30 Dec 2019 13:06:12 +0100 (CET)"],"X-Halon-ID":"c5b48ad4-2afc-11ea-a00b-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 30 Dec 2019 13:05:09 +0100","Message-Id":"<20191230120510.938333-25-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20191230120510.938333-1-niklas.soderlund@ragnatech.se>","References":"<20191230120510.938333-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 24/25] libcamera: pipeline: Remove\n\texplicit buffer handling","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 30 Dec 2019 12:06:14 -0000"},"content":"With the FrameBuffer interface in place there is no need for the Camera\nto call into the specific pipelines allocation and freeing of buffers as\nit no longer needs to be synchronized with buffer allocation by the\napplication.\n\nRemove the function prototypes in the pipeline handler base class and\nfold the functionality in the pipelines start() and stop() functions\nwhere needed. A follow up patch will remove the now no-op\nCamera::allocateBuffers() and Camera::freeBuffers().\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n src/libcamera/camera.cpp | 8 +------\n src/libcamera/include/pipeline_handler.h | 5 ----\n src/libcamera/pipeline/ipu3/ipu3.cpp | 24 ++++++++++++--------\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 24 ++++++++++++--------\n src/libcamera/pipeline/uvcvideo.cpp | 17 --------------\n src/libcamera/pipeline/vimc.cpp | 17 --------------\n src/libcamera/pipeline_handler.cpp | 29 ------------------------\n 7 files changed, 30 insertions(+), 94 deletions(-)","diff":"diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 5ea663ef85720f2e..dba537ef0da61b44 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -722,12 +722,6 @@ int Camera::allocateBuffers()\n \t\treturn -EINVAL;\n \t}\n \n-\tint ret = pipe_->allocateBuffers(this, activeStreams_);\n-\tif (ret) {\n-\t\tLOG(Camera, Error) << \"Failed to allocate buffers\";\n-\t\treturn ret;\n-\t}\n-\n \tstate_ = CameraPrepared;\n \n \treturn 0;\n@@ -748,7 +742,7 @@ int Camera::freeBuffers()\n \n \tstate_ = CameraConfigured;\n \n-\treturn pipe_->freeBuffers(this, activeStreams_);\n+\treturn 0;\n }\n \n /**\ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 20b866c4a511387a..6cee976a6ce1939d 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -76,11 +76,6 @@ public:\n \t\t\t\t unsigned int count) = 0;\n \tvirtual void freeFrameBuffers(Camera *camera, Stream *stream) = 0;\n \n-\tvirtual int allocateBuffers(Camera *camera,\n-\t\t\t\t const std::set &streams) = 0;\n-\tvirtual int freeBuffers(Camera *camera,\n-\t\t\t\tconst std::set &streams) = 0;\n-\n \tvirtual int start(Camera *camera) = 0;\n \tvirtual void stop(Camera *camera) = 0;\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex ea02a4e5f7f04718..4f837ebc68730883 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -213,11 +213,6 @@ public:\n \t\t\t unsigned int count) override;\n \tvoid freeFrameBuffers(Camera *camera, Stream *stream) override;\n \n-\tint allocateBuffers(Camera *camera,\n-\t\t\t const std::set &streams) override;\n-\tint freeBuffers(Camera *camera,\n-\t\t\tconst std::set &streams) override;\n-\n \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n \n@@ -234,6 +229,9 @@ private:\n \n \tint registerCameras();\n \n+\tint allocateBuffers(Camera *camera);\n+\tint freeBuffers(Camera *camera);\n+\n \tImgUDevice imgu0_;\n \tImgUDevice imgu1_;\n \tMediaDevice *cio2MediaDev_;\n@@ -654,8 +652,7 @@ void PipelineHandlerIPU3::freeFrameBuffers(Camera *camera, Stream *stream)\n * In order to be able to start the 'viewfinder' and 'stat' nodes, we need\n * memory to be reserved.\n */\n-int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n-\t\t\t\t\t const std::set &streams)\n+int PipelineHandlerIPU3::allocateBuffers(Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \tIPU3Stream *outStream = &data->outStream_;\n@@ -718,13 +715,12 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n \treturn 0;\n \n error:\n-\tfreeBuffers(camera, streams);\n+\tfreeBuffers(camera);\n \n \treturn ret;\n }\n \n-int PipelineHandlerIPU3::freeBuffers(Camera *camera,\n-\t\t\t\t const std::set &streams)\n+int PipelineHandlerIPU3::freeBuffers(Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \n@@ -741,6 +737,11 @@ int PipelineHandlerIPU3::start(Camera *camera)\n \tImgUDevice *imgu = data->imgu_;\n \tint ret;\n \n+\t/* Allocate buffers for internal pipeline usage. */\n+\tret = allocateBuffers(camera);\n+\tif (ret)\n+\t\treturn ret;\n+\n \t/*\n \t * Start the ImgU video devices, buffers will be queued to the\n \t * ImgU output and viewfinder when requests will be queued.\n@@ -759,6 +760,7 @@ int PipelineHandlerIPU3::start(Camera *camera)\n \treturn 0;\n \n error:\n+\tfreeBuffers(camera);\n \tLOG(IPU3, Error) << \"Failed to start camera \" << camera->name();\n \n \treturn ret;\n@@ -774,6 +776,8 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n \tif (ret)\n \t\tLOG(IPU3, Warning) << \"Failed to stop camera \"\n \t\t\t\t << camera->name();\n+\n+\tfreeBuffers(camera);\n }\n \n int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 7ed729fb7974d6ea..20d549f6dba649a5 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -181,11 +181,6 @@ public:\n \t\t\t unsigned int count) override;\n \tvoid freeFrameBuffers(Camera *camera, Stream *stream) override;\n \n-\tint allocateBuffers(Camera *camera,\n-\t\tconst std::set &streams) override;\n-\tint freeBuffers(Camera *camera,\n-\t\tconst std::set &streams) override;\n-\n \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n \n@@ -211,6 +206,9 @@ private:\n \tvoid paramReady(FrameBuffer *buffer);\n \tvoid statReady(FrameBuffer *buffer);\n \n+\tint allocateBuffers(Camera *camera);\n+\tint freeBuffers(Camera *camera);\n+\n \tMediaDevice *media_;\n \tV4L2Subdevice *dphy_;\n \tV4L2Subdevice *isp_;\n@@ -678,8 +676,7 @@ void PipelineHandlerRkISP1::freeFrameBuffers(Camera *camera, Stream *stream)\n \tvideo_->releaseBuffers();\n }\n \n-int PipelineHandlerRkISP1::allocateBuffers(Camera *camera,\n-\t\t\t\t\t const std::set &streams)\n+int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \tunsigned int count = 1;\n@@ -723,8 +720,7 @@ err:\n \treturn ret;\n }\n \n-int PipelineHandlerRkISP1::freeBuffers(Camera *camera,\n-\t\t\t\t const std::set &streams)\n+int PipelineHandlerRkISP1::freeBuffers(Camera *camera)\n {\n \tRkISP1CameraData *data = cameraData(camera);\n \n@@ -758,10 +754,16 @@ int PipelineHandlerRkISP1::start(Camera *camera)\n \tRkISP1CameraData *data = cameraData(camera);\n \tint ret;\n \n+\t/* Allocate buffers for internal pipeline usage. */\n+\tret = allocateBuffers(camera);\n+\tif (ret)\n+\t\treturn ret;\n+\n \tdata->frame_ = 0;\n \n \tret = param_->streamOn();\n \tif (ret) {\n+\t\tfreeBuffers(camera);\n \t\tLOG(RkISP1, Error)\n \t\t\t<< \"Failed to start parameters \" << camera->name();\n \t\treturn ret;\n@@ -770,6 +772,7 @@ int PipelineHandlerRkISP1::start(Camera *camera)\n \tret = stat_->streamOn();\n \tif (ret) {\n \t\tparam_->streamOff();\n+\t\tfreeBuffers(camera);\n \t\tLOG(RkISP1, Error)\n \t\t\t<< \"Failed to start statistics \" << camera->name();\n \t\treturn ret;\n@@ -779,6 +782,7 @@ int PipelineHandlerRkISP1::start(Camera *camera)\n \tif (ret) {\n \t\tparam_->streamOff();\n \t\tstat_->streamOff();\n+\t\tfreeBuffers(camera);\n \n \t\tLOG(RkISP1, Error)\n \t\t\t<< \"Failed to start camera \" << camera->name();\n@@ -823,6 +827,8 @@ void PipelineHandlerRkISP1::stop(Camera *camera)\n \n \tdata->timeline_.reset();\n \n+\tfreeBuffers(camera);\n+\n \tactiveCamera_ = nullptr;\n }\n \ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 1eb809914f9aa0dc..d972d1bbdb113b95 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -71,11 +71,6 @@ public:\n \t\t\t unsigned int count) override;\n \tvoid freeFrameBuffers(Camera *camera, Stream *stream) override;\n \n-\tint allocateBuffers(Camera *camera,\n-\t\t\t const std::set &streams) override;\n-\tint freeBuffers(Camera *camera,\n-\t\t\tconst std::set &streams) override;\n-\n \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n \n@@ -223,18 +218,6 @@ void PipelineHandlerUVC::freeFrameBuffers(Camera *camera, Stream *stream)\n \tdata->video_->releaseBuffers();\n }\n \n-int PipelineHandlerUVC::allocateBuffers(Camera *camera,\n-\t\t\t\t\tconst std::set &streams)\n-{\n-\treturn 0;\n-}\n-\n-int PipelineHandlerUVC::freeBuffers(Camera *camera,\n-\t\t\t\t const std::set &streams)\n-{\n-\treturn 0;\n-}\n-\n int PipelineHandlerUVC::start(Camera *camera)\n {\n \tUVCCameraData *data = cameraData(camera);\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 13a7fc6cb5294eec..215d50a70256773e 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -89,11 +89,6 @@ public:\n \t\t\t unsigned int count) override;\n \tvoid freeFrameBuffers(Camera *camera, Stream *stream) override;\n \n-\tint allocateBuffers(Camera *camera,\n-\t\t\t const std::set &streams) override;\n-\tint freeBuffers(Camera *camera,\n-\t\t\tconst std::set &streams) override;\n-\n \tint start(Camera *camera) override;\n \tvoid stop(Camera *camera) override;\n \n@@ -290,18 +285,6 @@ void PipelineHandlerVimc::freeFrameBuffers(Camera *camera, Stream *stream)\n \tdata->video_->releaseBuffers();\n }\n \n-int PipelineHandlerVimc::allocateBuffers(Camera *camera,\n-\t\t\t\t\t const std::set &streams)\n-{\n-\treturn 0;\n-}\n-\n-int PipelineHandlerVimc::freeBuffers(Camera *camera,\n-\t\t\t\t const std::set &streams)\n-{\n-\treturn 0;\n-}\n-\n int PipelineHandlerVimc::start(Camera *camera)\n {\n \tVimcCameraData *data = cameraData(camera);\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 11286d31d4e54213..19c9b6fe6e7fb03e 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -349,35 +349,6 @@ const ControlInfoMap &PipelineHandler::controls(Camera *camera)\n * The only intended caller is the FrameBufferAllocator helper.\n */\n \n-/**\n- * \\fn PipelineHandler::allocateBuffers()\n- * \\brief Allocate buffers for a stream\n- * \\param[in] camera The camera the \\a stream belongs to\n- * \\param[in] streams The set of streams to allocate buffers for\n- *\n- * This method allocates buffers internally in the pipeline handler for each\n- * stream in the \\a streams buffer set, and associates them with the stream's\n- * buffer pool.\n- *\n- * The intended caller of this method is the Camera class.\n- *\n- * \\return 0 on success or a negative error code otherwise\n- */\n-\n-/**\n- * \\fn PipelineHandler::freeBuffers()\n- * \\brief Free all buffers associated with a stream\n- * \\param[in] camera The camera the \\a stream belongs to\n- * \\param[in] streams The set of streams to free buffers from\n- *\n- * After a capture session has been stopped all buffers associated with each\n- * stream shall be freed.\n- *\n- * The intended caller of this method is the Camera class.\n- *\n- * \\return 0 on success or a negative error code otherwise\n- */\n-\n /**\n * \\fn PipelineHandler::start()\n * \\brief Start capturing from a group of streams\n","prefixes":["libcamera-devel","v2","24/25"]}