{"id":595,"url":"https://patchwork.libcamera.org/api/1.1/patches/595/?format=json","web_url":"https://patchwork.libcamera.org/patch/595/","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":"<20190220143736.529-2-niklas.soderlund@ragnatech.se>","date":"2019-02-20T14:37:33","name":"[libcamera-devel,1/4] cam: free allocated buffers when done capturing","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"078f908e483f0845608f29547fb735c3be41968e","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/595/mbox/","series":[{"id":187,"url":"https://patchwork.libcamera.org/api/1.1/series/187/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=187","date":"2019-02-20T14:37:32","name":"cam: improve error paths","version":1,"mbox":"https://patchwork.libcamera.org/series/187/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/595/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/595/checks/","tags":{},"headers":{"Return-Path":"","Received":["from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D9F1D60100\n\tfor ;\n\tWed, 20 Feb 2019 15:38:48 +0100 (CET)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 39bae34c-351d-11e9-b530-005056917a89;\n\tWed, 20 Feb 2019 15:38:45 +0100 (CET)"],"X-Halon-ID":"39bae34c-351d-11e9-b530-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 20 Feb 2019 15:37:33 +0100","Message-Id":"<20190220143736.529-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190220143736.529-1-niklas.soderlund@ragnatech.se>","References":"<20190220143736.529-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/4] cam: free allocated buffers when done\n\tcapturing","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":"Wed, 20 Feb 2019 14:38:49 -0000"},"content":"The allocated buffers needs to be freed once the application is done\nwith them.\n\nSigned-off-by: Niklas Söderlund \n---\n src/cam/main.cpp | 10 +++++++---\n 1 file changed, 7 insertions(+), 3 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 9b67ab75a6a1663e..b034eb25429abeb3 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -163,7 +163,8 @@ static int capture()\n \t\tRequest *request = camera->createRequest();\n \t\tif (!request) {\n \t\t\tstd::cerr << \"Can't create request\" << std::endl;\n-\t\t\treturn -ENOMEM;\n+\t\t\tret = -ENOMEM;\n+\t\t\tgoto out;\n \t\t}\n \n \t\tstd::map map;\n@@ -171,13 +172,13 @@ static int capture()\n \t\tret = request->setBuffers(map);\n \t\tif (ret < 0) {\n \t\t\tstd::cerr << \"Can't set buffers for request\" << std::endl;\n-\t\t\treturn ret;\n+\t\t\tgoto out;\n \t\t}\n \n \t\tret = camera->queueRequest(request);\n \t\tif (ret < 0) {\n \t\t\tstd::cerr << \"Can't queue request\" << std::endl;\n-\t\t\treturn ret;\n+\t\t\tgoto out;\n \t\t}\n \t}\n \n@@ -187,6 +188,9 @@ static int capture()\n \tret = loop->exec();\n \n \tcamera->stop();\n+out:\n+\tcamera->freeBuffers();\n+\n \treturn ret;\n }\n \n","prefixes":["libcamera-devel","1/4"]}