{"id":8585,"url":"https://patchwork.libcamera.org/api/patches/8585/?format=json","web_url":"https://patchwork.libcamera.org/patch/8585/","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":"<20200703123919.2223048-6-kieran.bingham@ideasonboard.com>","date":"2020-07-03T12:39:16","name":"[libcamera-devel,v3,5/8] android: camera_device: Create the Request and Camera3RequestDescriptor together","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8003e1b54d1a6ff3d946b5e24c6e31dad609d226","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8585/mbox/","series":[{"id":1077,"url":"https://patchwork.libcamera.org/api/series/1077/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1077","date":"2020-07-03T12:39:11","name":"android: Multi-stream support","version":3,"mbox":"https://patchwork.libcamera.org/series/1077/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8585/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8585/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 21D8ABFFE2\n\tfor ;\n\tFri, 3 Jul 2020 12:39:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D253E60D4A;\n\tFri, 3 Jul 2020 14:39:29 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0BD1E60C5F\n\tfor ;\n\tFri, 3 Jul 2020 14:39:26 +0200 (CEST)","from Q.local (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net\n\t[86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9244551B;\n\tFri, 3 Jul 2020 14:39:25 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"kydHAUEr\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593779965;\n\tbh=qeJ+ZIOias9edZVjxAqLBw9/f29qexUlY9weLvvwa8Y=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=kydHAUErcleAvW/atbkUyOfO9UzcXb70Z3qlsl4V9BJEat0u67QtfLXghj6KEKDp+\n\tV+FW0BjdEHqphYPcYU63Pp7SMn7Csy0AGZSijhnzjHXf3QCvw50glY/P+l0Q66LrCP\n\tfJVOwdR6sP4nM7DnYMvJLqAqk9q0oRdYEPESZoUU=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Fri, 3 Jul 2020 13:39:16 +0100","Message-Id":"<20200703123919.2223048-6-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200703123919.2223048-1-kieran.bingham@ideasonboard.com>","References":"<20200703123919.2223048-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 5/8] android: camera_device: Create the\n\tRequest and Camera3RequestDescriptor together","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Move the construction of the Request higher in the code flow\nso that multiple buffers and streams can be added where required.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Niklas Söderlund \n---\n src/android/camera_device.cpp | 7 +++++--\n 1 file changed, 5 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 73cfab532cf5..4e77a92dbea5 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1066,6 +1066,10 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \tCamera3RequestDescriptor *descriptor =\n \t\tnew Camera3RequestDescriptor(camera3Request->frame_number,\n \t\t\t\t\t camera3Request->num_output_buffers);\n+\n+\tRequest *request =\n+\t\tcamera_->createRequest(reinterpret_cast(descriptor));\n+\n \tfor (unsigned int i = 0; i < descriptor->numBuffers; ++i) {\n \t\t/*\n \t\t * Keep track of which stream the request belongs to and store\n@@ -1085,12 +1089,11 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[0].buffer);\n \tif (!buffer) {\n \t\tLOG(HAL, Error) << \"Failed to create buffer\";\n+\t\tdelete request;\n \t\tdelete descriptor;\n \t\treturn -ENOMEM;\n \t}\n \n-\tRequest *request =\n-\t\tcamera_->createRequest(reinterpret_cast(descriptor));\n \trequest->addBuffer(stream, buffer);\n \n \tint ret = camera_->queueRequest(request);\n","prefixes":["libcamera-devel","v3","5/8"]}