{"id":9662,"url":"https://patchwork.libcamera.org/api/1.1/patches/9662/?format=json","web_url":"https://patchwork.libcamera.org/patch/9662/","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":"<20200918135041.91492-5-jacopo@jmondi.org>","date":"2020-09-18T13:50:37","name":"[libcamera-devel,v2,4/8] android: camera_device: Clear allocator at configureStream","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"cb5dcdd4116f3ed842cc2fef2a8431062ec44b9a","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/9662/mbox/","series":[{"id":1296,"url":"https://patchwork.libcamera.org/api/1.1/series/1296/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1296","date":"2020-09-18T13:50:33","name":"android: camera_device: Add support for internal buffers","version":2,"mbox":"https://patchwork.libcamera.org/series/1296/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9662/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9662/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 ACBCABF01C\n\tfor ;\n\tFri, 18 Sep 2020 13:47:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 88E7A62FB5;\n\tFri, 18 Sep 2020 15:47:22 +0200 (CEST)","from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2CB4162F4F\n\tfor ;\n\tFri, 18 Sep 2020 15:47:21 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 041E940009;\n\tFri, 18 Sep 2020 13:47:19 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 18 Sep 2020 15:50:37 +0200","Message-Id":"<20200918135041.91492-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200918135041.91492-1-jacopo@jmondi.org>","References":"<20200918135041.91492-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 4/8] android: camera_device: Clear\n\tallocator at configureStream","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","Cc":"hanlinchen@chromium.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The configureStream operation might be called by the Android framework\nin two successive capture session without going through a close().\n\nClear all the allocated buffers before configuring the camera streams.\n\nReviewed-by: Niklas Söderlund \nReviewed-by: Hirokazu Honda \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 7 ++++---\n 1 file changed, 4 insertions(+), 3 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 98b8159ebd8c..42fb9ea4e113 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1182,12 +1182,13 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t}\n \n \t/*\n-\t * Clear and remove any existing configuration from previous calls, and\n-\t * ensure the required entries are available without further\n-\t * reallocation.\n+\t * Clear and remove any existing configuration and memory allocated from\n+\t * previous calls, and ensure the required entries are available without\n+\t * further reallocation.\n \t */\n \tstreams_.clear();\n \tstreams_.reserve(stream_list->num_streams);\n+\tallocator_.clear();\n \n \t/* First handle all non-MJPEG streams. */\n \tcamera3_stream_t *jpegStream = nullptr;\n","prefixes":["libcamera-devel","v2","4/8"]}