{"id":8656,"url":"https://patchwork.libcamera.org/api/patches/8656/?format=json","web_url":"https://patchwork.libcamera.org/patch/8656/","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":"<20200706153808.2340919-6-kieran.bingham@ideasonboard.com>","date":"2020-07-06T15:38:05","name":"[libcamera-devel,v4,5/8] android: camera_device: Create the Request and Camera3RequestDescriptor together","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"876665b59552052bbacf0a70848d3bb33be352c7","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/8656/mbox/","series":[{"id":1088,"url":"https://patchwork.libcamera.org/api/series/1088/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1088","date":"2020-07-06T15:38:00","name":"android: Multi-stream support","version":4,"mbox":"https://patchwork.libcamera.org/series/1088/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8656/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8656/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 57688BD794\n\tfor ;\n\tMon, 6 Jul 2020 15:38:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1CB6460E48;\n\tMon, 6 Jul 2020 17:38:19 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9EF0D60E1D\n\tfor ;\n\tMon, 6 Jul 2020 17:38:14 +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 1E5B4A16;\n\tMon, 6 Jul 2020 17:38:14 +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=\"wOnWiF+4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594049894;\n\tbh=a5CwUdAjxt3flUTMdLjOgunysTtRsVIh3WDEwpt9gzI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=wOnWiF+4abQ5Jt7e7VP2O5OM/CdbjL/N3LArpk0Jep4VXZpD0ugI+EYIV9pdCF4kw\n\tGdiSY/zizwrjyeXcx6tOdvYzHE622mMoZfdwJTG31ysK14ZGX9/B29IXiqxvSqii4h\n\tbhpU2Lhjga0Cys6X3h2pmwYcPhyIrL/jaO+45OYU=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Mon, 6 Jul 2020 16:38:05 +0100","Message-Id":"<20200706153808.2340919-6-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200706153808.2340919-1-kieran.bingham@ideasonboard.com>","References":"<20200706153808.2340919-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 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 so that\nmultiple buffers and streams can be added where required.\n\nThe Request is now stored as a unique_ptr within the\nCamera3RequestDescriptor to enforce a shared lifetime between the\nobjects, freeing the Request when the descriptor is destroyed.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \nReviewed-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 9 ++++++---\n src/android/camera_device.h | 1 +\n 2 files changed, 7 insertions(+), 3 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 73cfab532cf5..fb120e8007dc 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1066,6 +1066,12 @@ 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+\tdescriptor->request = std::unique_ptr(request);\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@@ -1089,14 +1095,11 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\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 \tif (ret) {\n \t\tLOG(HAL, Error) << \"Failed to queue request\";\n-\t\tdelete request;\n \t\tdelete descriptor;\n \t\treturn ret;\n \t}\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex d7834d94f439..018491d70c0a 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -61,6 +61,7 @@ private:\n \t\tuint32_t frameNumber;\n \t\tuint32_t numBuffers;\n \t\tcamera3_stream_buffer_t *buffers;\n+\t\tstd::unique_ptr request;\n \t};\n \n \tstruct Camera3StreamConfiguration {\n","prefixes":["libcamera-devel","v4","5/8"]}