{"id":19650,"url":"https://patchwork.libcamera.org/api/1.1/patches/19650/?format=json","web_url":"https://patchwork.libcamera.org/patch/19650/","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":"<20240310012946.727641-4-pobrn@protonmail.com>","date":"2024-03-10T01:30:04","name":"[v1,3/3] libcamera: framebuffer_allocator: remove entry if allocation fails","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"9bd387ccd8daaf2c4d9b6468714cc7b683c7fe88","submitter":{"id":133,"url":"https://patchwork.libcamera.org/api/1.1/people/133/?format=json","name":"Pőcze Barnabás","email":"pobrn@protonmail.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19650/mbox/","series":[{"id":4208,"url":"https://patchwork.libcamera.org/api/1.1/series/4208/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4208","date":"2024-03-10T01:29:49","name":"couple FrameBufferAllocator changes","version":1,"mbox":"https://patchwork.libcamera.org/series/4208/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19650/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19650/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 3A6A0BD1F1\n\tfor ;\n\tSun, 10 Mar 2024 01:30:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D952E62874;\n\tSun, 10 Mar 2024 02:30:24 +0100 (CET)","from mail-4316.protonmail.ch (mail-4316.protonmail.ch\n\t[185.70.43.16])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5755B62872\n\tfor ;\n\tSun, 10 Mar 2024 02:30:23 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=protonmail.com header.i=@protonmail.com\n\theader.b=\"RFRbsOSm\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;\n\ts=protonmail3; t=1710034222; x=1710293422;\n\tbh=hYDEePEGUuUyQDkfnqPPozlg304XbTs7eCFonztO+sk=;\n\th=Date:To:From:Subject:Message-ID:In-Reply-To:References:\n\tFeedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID:\n\tMessage-ID:BIMI-Selector;\n\tb=RFRbsOSm4Yd9mVpCBW49Aa7zEIyVC9DO/ZpLYuV6DiZ5AN1fKnwMQkYJK9rkAJGdT\n\tDgFgj3q5GYLhMxVWJBG1Xe3S3uSxFudv0AsRmETtbVGOpxn6J9hqbYIxhAGOz5CEj+\n\tuaP5KvC4jdn/2u8gDxiIBYsMOe3hvyZZlUFS3KyJmy3jjdA6yhIvNM8M9OfdLEMGH3\n\tSC6rbVYsYQV2y853xNOznNjRC7Ioo5bUGbaXmMEYk9/Dh3w4ZhbFcqI7DUwqJCr+NI\n\t5y5kDFRuKKoOJGevUfpdV9+8eoNVPN3cSnqslRXr9n6T1zJ1WoYRGOUdIR7cKr7cMT\n\tXr0ofyrkcZQ1w==","Date":"Sun, 10 Mar 2024 01:30:04 +0000","To":"libcamera-devel@lists.libcamera.org","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Subject":"[PATCH v1 3/3] libcamera: framebuffer_allocator: remove entry if\n\tallocation fails","Message-ID":"<20240310012946.727641-4-pobrn@protonmail.com>","In-Reply-To":"<20240310012946.727641-1-pobrn@protonmail.com>","References":"<20240310012946.727641-1-pobrn@protonmail.com>","Feedback-ID":"20568564:user:proton","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"quoted-printable","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Remove the entry from the `buffers_` mapping if\n`Camera::exportFrameBuffers()` fails, otherwise\nthere would be a stale entry in the map.\n---\n src/libcamera/framebuffer_allocator.cpp | 4 ++++\n 1 file changed, 4 insertions(+)","diff":"diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp\nindex fc19a33a..dbd0db19 100644\n--- a/src/libcamera/framebuffer_allocator.cpp\n+++ b/src/libcamera/framebuffer_allocator.cpp\n@@ -97,6 +97,10 @@ int FrameBufferAllocator::allocate(Stream *stream)\n \t\tLOG(Allocator, Error)\n \t\t\t<< \"Stream is not part of \" << camera_->id()\n \t\t\t<< \" active configuration\";\n+\n+\tif (ret < 0)\n+\t\tbuffers_.erase(it);\n+\n \treturn ret;\n }\n \n","prefixes":["v1","3/3"]}