{"id":2597,"url":"https://patchwork.libcamera.org/api/patches/2597/?format=json","web_url":"https://patchwork.libcamera.org/patch/2597/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200112010212.2609025-16-niklas.soderlund@ragnatech.se>","date":"2020-01-12T01:01:55","name":"[libcamera-devel,v4,15/32] libcamera: request: In addBuffer() do not fetch stream from Buffer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"d54af57383388841a23900163ebbad9c7e0af5c3","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2597/mbox/","series":[{"id":617,"url":"https://patchwork.libcamera.org/api/series/617/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=617","date":"2020-01-12T01:01:40","name":"libcamera: Rework buffer API","version":4,"mbox":"https://patchwork.libcamera.org/series/617/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2597/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2597/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 C3BF1606DA\n\tfor ;\n\tSun, 12 Jan 2020 02:03:10 +0100 (CET)","from bismarck.berto.se (p54ac5d7b.dip0.t-ipconnect.de\n\t[84.172.93.123]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 4ad63666-34d7-11ea-b6d8-005056917f90;\n\tSun, 12 Jan 2020 02:03:07 +0100 (CET)"],"X-Halon-ID":"4ad63666-34d7-11ea-b6d8-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 12 Jan 2020 02:01:55 +0100","Message-Id":"<20200112010212.2609025-16-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200112010212.2609025-1-niklas.soderlund@ragnatech.se>","References":"<20200112010212.2609025-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 15/32] libcamera: request: In\n\taddBuffer() do not fetch stream from Buffer","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":"Sun, 12 Jan 2020 01:03:11 -0000"},"content":"In the FrameBuffer interface the stream will not be available from the\nbuffer object as the buffer might be allocated externally. The\napplication needs to explicitly state which stream the buffer is being\nadded for to the request.\n\nExtend the addBuffer() function to get this information explicitly from\nthe caller.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/request.h | 2 +-\n src/android/camera_device.cpp | 2 +-\n src/cam/capture.cpp | 4 ++--\n src/libcamera/request.cpp | 4 ++--\n src/qcam/main_window.cpp | 4 ++--\n src/v4l2/v4l2_camera.cpp | 2 +-\n test/camera/buffer_import.cpp | 2 +-\n test/camera/capture.cpp | 4 ++--\n test/camera/statemachine.cpp | 2 +-\n 9 files changed, 13 insertions(+), 13 deletions(-)","diff":"diff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex 728f380de4f010c3..b832422482645f25 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -39,7 +39,7 @@ public:\n \tControlList &controls() { return *controls_; }\n \tControlList &metadata() { return *metadata_; }\n \tconst std::map &buffers() const { return bufferMap_; }\n-\tint addBuffer(std::unique_ptr buffer);\n+\tint addBuffer(Stream *stream, std::unique_ptr buffer);\n \tBuffer *findBuffer(Stream *stream) const;\n \n \tuint64_t cookie() const { return cookie_; }\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 065e0292e186c2ad..09588c16a6301649 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -754,7 +754,7 @@ void CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reque\n \n \tRequest *request =\n \t\tcamera_->createRequest(reinterpret_cast(descriptor));\n-\trequest->addBuffer(std::move(buffer));\n+\trequest->addBuffer(stream, std::move(buffer));\n \n \tint ret = camera_->queueRequest(request);\n \tif (ret) {\ndiff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\nindex 4b65b1d0a2dbed35..1a4dbe7ce4a15a2d 100644\n--- a/src/cam/capture.cpp\n+++ b/src/cam/capture.cpp\n@@ -95,7 +95,7 @@ int Capture::capture(EventLoop *loop)\n \t\t\tStream *stream = cfg.stream();\n \t\t\tstd::unique_ptr buffer = stream->createBuffer(i);\n \n-\t\t\tret = request->addBuffer(std::move(buffer));\n+\t\t\tret = request->addBuffer(stream, std::move(buffer));\n \t\t\tif (ret < 0) {\n \t\t\t\tstd::cerr << \"Can't set buffer for request\"\n \t\t\t\t\t << std::endl;\n@@ -185,7 +185,7 @@ void Capture::requestComplete(Request *request)\n \t\t\treturn;\n \t\t}\n \n-\t\trequest->addBuffer(std::move(newBuffer));\n+\t\trequest->addBuffer(stream, std::move(newBuffer));\n \t}\n \n \tcamera_->queueRequest(request);\ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex 92330c1a37290fc2..54dfb461c58b6971 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -113,6 +113,7 @@ Request::~Request()\n \n /**\n * \\brief Store a Buffer with its associated Stream in the Request\n+ * \\param[in] stream The stream the buffer belongs to\n * \\param[in] buffer The Buffer to store in the request\n *\n * Ownership of the buffer is passed to the request. It will be deleted when\n@@ -125,9 +126,8 @@ Request::~Request()\n * \\retval -EEXIST The request already contains a buffer for the stream\n * \\retval -EINVAL The buffer does not reference a valid Stream\n */\n-int Request::addBuffer(std::unique_ptr buffer)\n+int Request::addBuffer(Stream *stream, std::unique_ptr buffer)\n {\n-\tStream *stream = buffer->stream();\n \tif (!stream) {\n \t\tLOG(Request, Error) << \"Invalid stream reference\";\n \t\treturn -EINVAL;\ndiff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 0a353e8ba247caf9..8b3d99237047a9e5 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -191,7 +191,7 @@ int MainWindow::startCapture()\n \t\t\tgoto error;\n \t\t}\n \n-\t\tret = request->addBuffer(std::move(buffer));\n+\t\tret = request->addBuffer(stream, std::move(buffer));\n \t\tif (ret < 0) {\n \t\t\tstd::cerr << \"Can't set buffer for request\" << std::endl;\n \t\t\tgoto error;\n@@ -289,7 +289,7 @@ void MainWindow::requestComplete(Request *request)\n \t\t\treturn;\n \t\t}\n \n-\t\trequest->addBuffer(std::move(newBuffer));\n+\t\trequest->addBuffer(stream, std::move(newBuffer));\n \t}\n \n \tcamera_->queueRequest(request);\ndiff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp\nindex 7221755ddb5db4bf..b6e0bb762bcd79fe 100644\n--- a/src/v4l2/v4l2_camera.cpp\n+++ b/src/v4l2/v4l2_camera.cpp\n@@ -192,7 +192,7 @@ int V4L2Camera::qbuf(unsigned int index)\n \t\treturn -ENOMEM;\n \t}\n \n-\tint ret = request->addBuffer(std::move(buffer));\n+\tint ret = request->addBuffer(stream, std::move(buffer));\n \tif (ret < 0) {\n \t\tLOG(V4L2Compat, Error) << \"Can't set buffer for request\";\n \t\treturn -ENOMEM;\ndiff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp\nindex 171540edd96f9fca..e5c010d81b8d6e0e 100644\n--- a/test/camera/buffer_import.cpp\n+++ b/test/camera/buffer_import.cpp\n@@ -268,7 +268,7 @@ public:\n \t\tRequest *request = camera_->createRequest(cookie);\n \n \t\tstd::unique_ptr buffer = stream_->createBuffer({ dmabuf, -1, -1 });\n-\t\trequest->addBuffer(move(buffer));\n+\t\trequest->addBuffer(stream_, move(buffer));\n \t\tcamera_->queueRequest(request);\n \t}\n \ndiff --git a/test/camera/capture.cpp b/test/camera/capture.cpp\nindex 7cb76038f557d461..ca1ebe419946dd4d 100644\n--- a/test/camera/capture.cpp\n+++ b/test/camera/capture.cpp\n@@ -49,7 +49,7 @@ protected:\n \t\tstd::unique_ptr newBuffer = stream->createBuffer(buffer->index());\n \n \t\trequest = camera_->createRequest();\n-\t\trequest->addBuffer(std::move(newBuffer));\n+\t\trequest->addBuffer(stream, std::move(newBuffer));\n \t\tcamera_->queueRequest(request);\n \t}\n \n@@ -101,7 +101,7 @@ protected:\n \t\t\t\treturn TestFail;\n \t\t\t}\n \n-\t\t\tif (request->addBuffer(std::move(buffer))) {\n+\t\t\tif (request->addBuffer(stream, std::move(buffer))) {\n \t\t\t\tcout << \"Failed to associating buffer with request\" << endl;\n \t\t\t\treturn TestFail;\n \t\t\t}\ndiff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp\nindex afa13ba77b0b7fe0..f627b8f37422350e 100644\n--- a/test/camera/statemachine.cpp\n+++ b/test/camera/statemachine.cpp\n@@ -219,7 +219,7 @@ protected:\n \n \t\tStream *stream = *camera_->streams().begin();\n \t\tstd::unique_ptr buffer = stream->createBuffer(0);\n-\t\tif (request->addBuffer(std::move(buffer)))\n+\t\tif (request->addBuffer(stream, std::move(buffer)))\n \t\t\treturn TestFail;\n \n \t\tif (camera_->queueRequest(request))\n","prefixes":["libcamera-devel","v4","15/32"]}