{"id":13974,"url":"https://patchwork.libcamera.org/api/1.1/patches/13974/?format=json","web_url":"https://patchwork.libcamera.org/patch/13974/","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":"<20210929071708.299946-2-umang.jain@ideasonboard.com>","date":"2021-09-29T07:17:06","name":"[libcamera-devel,v3,1/3] android: camera_worker: Use Camera3RequestDescriptor as cookie","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"38b33396684f74af08c5cf597309fb22f732f66f","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/1.1/people/86/?format=json","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"delegate":{"id":12,"url":"https://patchwork.libcamera.org/api/1.1/users/12/?format=json","username":"uajain","first_name":"Umang","last_name":"Jain","email":"umang.jain@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/13974/mbox/","series":[{"id":2584,"url":"https://patchwork.libcamera.org/api/1.1/series/2584/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2584","date":"2021-09-29T07:17:05","name":"Camera3RequestDescriptors std::map => std::queue","version":3,"mbox":"https://patchwork.libcamera.org/series/2584/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13974/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13974/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 B2024BDC71\n\tfor ;\n\tWed, 29 Sep 2021 07:17:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5C24C69194;\n\tWed, 29 Sep 2021 09:17:20 +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 687E26918A\n\tfor ;\n\tWed, 29 Sep 2021 09:17:18 +0200 (CEST)","from perceval.ideasonboard.com (unknown [103.251.226.9])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EDEAE3F0;\n\tWed, 29 Sep 2021 09:17:16 +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=\"h0JstuXQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632899837;\n\tbh=obTjWaTTYTC7mFcpsxjahlOCElHoM+bQjIizlDXbVUQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=h0JstuXQVcHxQT9dl+i+OzNxi0uBOUf+Z6jvs4fk6ibKLjMn65D7KCWKlygHfdYcF\n\tF972/eUw4tHjbzkS7Q5n7hS12SJgc9Z4HbRmcS1bUwkMwR3H1yaVZ8VIyzgEhPoOmj\n\t8ImPnQOKr+WKIOYboTGnl2sOd49IYn/iJjQ+3cKk=","From":"Umang Jain ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 29 Sep 2021 12:47:06 +0530","Message-Id":"<20210929071708.299946-2-umang.jain@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210929071708.299946-1-umang.jain@ideasonboard.com>","References":"<20210929071708.299946-1-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 1/3] android: camera_worker: Use\n\tCamera3RequestDescriptor as cookie","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":"Use Camera3RequestDescriptor as cookie for the Capture Request.\nThe cookie is used to lookup descriptors map in\nCameraDevice::requestComplete(). The map will be transformed to a\nqueue in subsequent commit.\n\nSigned-off-by: Umang Jain \nReviewed-by: Laurent Pinchart \nReviewed-by: Hirokazu Honda \n---\n src/android/camera_device.cpp | 3 ++-\n src/android/camera_worker.cpp | 4 ++--\n src/android/camera_worker.h | 3 ++-\n 3 files changed, 6 insertions(+), 4 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 0fe11fe8..9287ea07 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -244,7 +244,8 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n \t * Create the CaptureRequest, stored as a unique_ptr<> to tie its\n \t * lifetime to the descriptor.\n \t */\n-\trequest_ = std::make_unique(camera);\n+\trequest_ = std::make_unique(camera,\n+\t\t\t\t\t\t reinterpret_cast(this));\n }\n \n /*\ndiff --git a/src/android/camera_worker.cpp b/src/android/camera_worker.cpp\nindex 91313183..dabb3054 100644\n--- a/src/android/camera_worker.cpp\n+++ b/src/android/camera_worker.cpp\n@@ -27,10 +27,10 @@ LOG_DECLARE_CATEGORY(HAL)\n * by the CameraWorker which queues it to the libcamera::Camera after handling\n * fences.\n */\n-CaptureRequest::CaptureRequest(Camera *camera)\n+CaptureRequest::CaptureRequest(Camera *camera, uint64_t cookie)\n \t: camera_(camera)\n {\n-\trequest_ = camera_->createRequest(reinterpret_cast(this));\n+\trequest_ = camera_->createRequest(cookie);\n }\n \n void CaptureRequest::addBuffer(Stream *stream, FrameBuffer *buffer, int fence)\ndiff --git a/src/android/camera_worker.h b/src/android/camera_worker.h\nindex 67ae50bd..c94f1632 100644\n--- a/src/android/camera_worker.h\n+++ b/src/android/camera_worker.h\n@@ -8,6 +8,7 @@\n #define __ANDROID_CAMERA_WORKER_H__\n \n #include \n+#include \n \n #include \n #include \n@@ -22,7 +23,7 @@ class CameraDevice;\n class CaptureRequest\n {\n public:\n-\tCaptureRequest(libcamera::Camera *camera);\n+\tCaptureRequest(libcamera::Camera *camera, uint64_t cookie);\n \n \tconst std::vector &fences() const { return acquireFences_; }\n \tlibcamera::ControlList &controls() { return request_->controls(); }\n","prefixes":["libcamera-devel","v3","1/3"]}