{"id":996,"url":"https://patchwork.libcamera.org/api/1.1/patches/996/?format=json","web_url":"https://patchwork.libcamera.org/patch/996/","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":"<20190415231859.9747-4-jacopo@jmondi.org>","date":"2019-04-15T23:18:55","name":"[libcamera-devel,v5,3/7] libcamera: camera: Pass the stream set to allocate/freeBuffers()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b4471331a1f9af961d3058fe4f2c890487bfa1c7","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/996/mbox/","series":[{"id":251,"url":"https://patchwork.libcamera.org/api/1.1/series/251/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=251","date":"2019-04-15T23:18:52","name":"libcamera: Framework changes to prepare for multiple streams support","version":5,"mbox":"https://patchwork.libcamera.org/series/251/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/996/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/996/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9CF7A60DC4\n\tfor ;\n\tTue, 16 Apr 2019 01:18:20 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id E743A1BF203;\n\tMon, 15 Apr 2019 23:18:19 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 16 Apr 2019 01:18:55 +0200","Message-Id":"<20190415231859.9747-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190415231859.9747-1-jacopo@jmondi.org>","References":"<20190415231859.9747-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 3/7] libcamera: camera: Pass the stream\n\tset to allocate/freeBuffers()","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":"Mon, 15 Apr 2019 23:18:20 -0000"},"content":"Pipeline handlers might need to perform allocation of internal buffers,\nsetup operations, or simple sanity check before going into the\nper-stream buffer allocation.\n\nAs of now, PipelineHandler::allocateBuffers() is called once for each\nactive stream, leaving no space for stream-independent configuration.\n\nChange this by providing to the pipeline handlers the full set of active\nstreams, and ask them to loop over them to perform per-streams\nmemory allocations and freeing.\n\nReviewed-by: Niklas Söderlund \nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/camera.cpp | 17 ++++++-----------\n src/libcamera/include/pipeline_handler.h | 6 ++++--\n src/libcamera/pipeline/ipu3/ipu3.cpp | 13 +++++++++----\n src/libcamera/pipeline/uvcvideo.cpp | 13 +++++++++----\n src/libcamera/pipeline/vimc.cpp | 13 +++++++++----\n src/libcamera/pipeline_handler.cpp | 11 ++++++-----\n 6 files changed, 43 insertions(+), 30 deletions(-)","diff":"diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 7f2dc904df16..21caa24b90b5 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -647,13 +647,11 @@ int Camera::allocateBuffers()\n \t\treturn -EINVAL;\n \t}\n \n-\tfor (Stream *stream : activeStreams_) {\n-\t\tint ret = pipe_->allocateBuffers(this, stream);\n-\t\tif (ret) {\n-\t\t\tLOG(Camera, Error) << \"Failed to allocate buffers\";\n-\t\t\tfreeBuffers();\n-\t\t\treturn ret;\n-\t\t}\n+\tint ret = pipe_->allocateBuffers(this, activeStreams_);\n+\tif (ret) {\n+\t\tLOG(Camera, Error) << \"Failed to allocate buffers\";\n+\t\tfreeBuffers();\n+\t\treturn ret;\n \t}\n \n \tstate_ = CameraPrepared;\n@@ -671,8 +669,6 @@ int Camera::allocateBuffers()\n */\n int Camera::freeBuffers()\n {\n-\tint ret = 0;\n-\n \tif (!stateIs(CameraPrepared))\n \t\treturn -EACCES;\n \n@@ -685,12 +681,11 @@ int Camera::freeBuffers()\n \t\t * by the V4L2 device that has allocated them.\n \t\t */\n \t\tstream->bufferPool().destroyBuffers();\n-\t\tret |= pipe_->freeBuffers(this, stream);\n \t}\n \n \tstate_ = CameraConfigured;\n \n-\treturn ret;\n+\treturn pipe_->freeBuffers(this, activeStreams_);\n }\n \n /**\ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 33b820e706cc..a0862ebf35df 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -58,8 +58,10 @@ public:\n \tstreamConfiguration(Camera *camera, const std::vector &usages) = 0;\n \tvirtual int configureStreams(Camera *camera, const CameraConfiguration &config) = 0;\n \n-\tvirtual int allocateBuffers(Camera *camera, Stream *stream) = 0;\n-\tvirtual int freeBuffers(Camera *camera, Stream *stream) = 0;\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);\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex ca09da753b90..f96e8763bce9 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -145,8 +145,10 @@ public:\n \tint configureStreams(Camera *camera,\n \t\t\t const CameraConfiguration &config) override;\n \n-\tint allocateBuffers(Camera *camera, Stream *stream) override;\n-\tint freeBuffers(Camera *camera, Stream *stream) override;\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@@ -305,9 +307,11 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,\n \treturn 0;\n }\n \n-int PipelineHandlerIPU3::allocateBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerIPU3::allocateBuffers(Camera *camera,\n+\t\t\t\t\t const std::set &streams)\n {\n \tIPU3CameraData *data = cameraData(camera);\n+\tStream *stream = *streams.begin();\n \tCIO2Device *cio2 = &data->cio2_;\n \tImgUDevice *imgu = data->imgu_;\n \tint ret;\n@@ -346,7 +350,8 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera, Stream *stream)\n \treturn 0;\n }\n \n-int PipelineHandlerIPU3::freeBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerIPU3::freeBuffers(Camera *camera,\n+\t\t\t\t const std::set &streams)\n {\n \tIPU3CameraData *data = cameraData(camera);\n \ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex cd472cfadd86..b8f634d88b46 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -32,8 +32,10 @@ public:\n \tint configureStreams(Camera *camera,\n \t\t\t const CameraConfiguration &config) override;\n \n-\tint allocateBuffers(Camera *camera, Stream *stream) override;\n-\tint freeBuffers(Camera *camera, Stream *stream) override;\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@@ -127,9 +129,11 @@ int PipelineHandlerUVC::configureStreams(Camera *camera,\n \treturn 0;\n }\n \n-int PipelineHandlerUVC::allocateBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerUVC::allocateBuffers(Camera *camera,\n+\t\t\t\t\tconst std::set &streams)\n {\n \tUVCCameraData *data = cameraData(camera);\n+\tStream *stream = *streams.begin();\n \tconst StreamConfiguration &cfg = stream->configuration();\n \n \tLOG(UVC, Debug) << \"Requesting \" << cfg.bufferCount << \" buffers\";\n@@ -137,7 +141,8 @@ int PipelineHandlerUVC::allocateBuffers(Camera *camera, Stream *stream)\n \treturn data->video_->exportBuffers(&stream->bufferPool());\n }\n \n-int PipelineHandlerUVC::freeBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerUVC::freeBuffers(Camera *camera,\n+\t\t\t\t const std::set &streams)\n {\n \tUVCCameraData *data = cameraData(camera);\n \treturn data->video_->releaseBuffers();\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex c8bbe2a19847..22449e47bc2d 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -32,8 +32,10 @@ public:\n \tint configureStreams(Camera *camera,\n \t\t\t const CameraConfiguration &config) override;\n \n-\tint allocateBuffers(Camera *camera, Stream *stream) override;\n-\tint freeBuffers(Camera *camera, Stream *stream) override;\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@@ -127,9 +129,11 @@ int PipelineHandlerVimc::configureStreams(Camera *camera,\n \treturn 0;\n }\n \n-int PipelineHandlerVimc::allocateBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerVimc::allocateBuffers(Camera *camera,\n+\t\t\t\t\t const std::set &streams)\n {\n \tVimcCameraData *data = cameraData(camera);\n+\tStream *stream = *streams.begin();\n \tconst StreamConfiguration &cfg = stream->configuration();\n \n \tLOG(VIMC, Debug) << \"Requesting \" << cfg.bufferCount << \" buffers\";\n@@ -137,7 +141,8 @@ int PipelineHandlerVimc::allocateBuffers(Camera *camera, Stream *stream)\n \treturn data->video_->exportBuffers(&stream->bufferPool());\n }\n \n-int PipelineHandlerVimc::freeBuffers(Camera *camera, Stream *stream)\n+int PipelineHandlerVimc::freeBuffers(Camera *camera,\n+\t\t\t\t const std::set &streams)\n {\n \tVimcCameraData *data = cameraData(camera);\n \treturn data->video_->releaseBuffers();\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 43550c0e0210..911d08448e69 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -193,10 +193,11 @@ PipelineHandler::~PipelineHandler()\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] stream The stream to allocate buffers for\n+ * \\param[in] streams The set of streams to allocate buffers for\n *\n- * This method allocates buffers internally in the pipeline handler and\n- * associates them with the stream's buffer pool.\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@@ -207,9 +208,9 @@ PipelineHandler::~PipelineHandler()\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] stream The stream to free buffers from\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 the\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","prefixes":["libcamera-devel","v5","3/7"]}