{"id":1549,"url":"https://patchwork.libcamera.org/api/1.1/patches/1549/?format=json","web_url":"https://patchwork.libcamera.org/patch/1549/","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":"<20190630233817.10130-8-laurent.pinchart@ideasonboard.com>","date":"2019-06-30T23:38:10","name":"[libcamera-devel,v3,07/14] libcamera: request: Add a ControlList","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"89326897c5fe6a59ed980e8677be522f9a3da498","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1549/mbox/","series":[{"id":384,"url":"https://patchwork.libcamera.org/api/1.1/series/384/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=384","date":"2019-06-30T23:38:03","name":"libcamera Controls","version":3,"mbox":"https://patchwork.libcamera.org/series/384/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1549/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1549/checks/","tags":{},"headers":{"Return-Path":"","Received":["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 D2B5961F46\n\tfor ;\n\tMon, 1 Jul 2019 01:38:44 +0200 (CEST)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 819DF255\n\tfor ;\n\tMon, 1 Jul 2019 01:38:44 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1561937924;\n\tbh=CsQMXeHj7pDQVn7vHWJ5yIaOzWLdc/egGpQtVEelLkw=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=XAZ2uZzbSuNpa/gGsB0Y07Sbk87YH8mb488emx2Ty64l8kvcfOxv5mXIGrubbA74p\n\t8giUmLoY+gZ2lgrrRm5SY/yWw0V42dDNZfpuIJyZv/dvfhyvE//NOptpGEkYtBbghc\n\tM3zYUzQfrJkwaQu5HzrvoBorOSdRy5vskqWNruQU=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 1 Jul 2019 02:38:10 +0300","Message-Id":"<20190630233817.10130-8-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190630233817.10130-1-laurent.pinchart@ideasonboard.com>","References":"<20190630233817.10130-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 07/14] libcamera: request: Add a\n\tControlList","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sun, 30 Jun 2019 23:38:46 -0000"},"content":"From: Kieran Bingham \n\nProvide a ControlList on request objects to facilitate setting controls.\n\nSigned-off-by: Kieran Bingham \n---\n include/libcamera/request.h | 3 +++\n src/libcamera/request.cpp | 15 ++++++++++++++-\n 2 files changed, 17 insertions(+), 1 deletion(-)","diff":"diff --git a/include/libcamera/request.h b/include/libcamera/request.h\nindex 58de6f00a554..8075270a9a12 100644\n--- a/include/libcamera/request.h\n+++ b/include/libcamera/request.h\n@@ -11,6 +11,7 @@\n #include \n \n #include \n+#include \n \n namespace libcamera {\n \n@@ -32,6 +33,7 @@ public:\n \tRequest(const Request &) = delete;\n \tRequest &operator=(const Request &) = delete;\n \n+\tControlList &controls() { return controls_; }\n \tconst std::map &buffers() const { return bufferMap_; }\n \tint setBuffers(const std::map &streamMap);\n \tBuffer *findBuffer(Stream *stream) const;\n@@ -50,6 +52,7 @@ private:\n \tbool completeBuffer(Buffer *buffer);\n \n \tCamera *camera_;\n+\tControlList controls_;\n \tstd::map bufferMap_;\n \tstd::unordered_set pending_;\n \ndiff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp\nindex fa3ee46da440..7d91e7f900fe 100644\n--- a/src/libcamera/request.cpp\n+++ b/src/libcamera/request.cpp\n@@ -48,10 +48,20 @@ LOG_DEFINE_CATEGORY(Request)\n * \\param[in] camera The camera that creates the request\n */\n Request::Request(Camera *camera)\n-\t: camera_(camera), status_(RequestPending)\n+\t: camera_(camera), controls_(camera), status_(RequestPending)\n {\n }\n \n+/**\n+ * \\fn Request::controls()\n+ * \\brief Retrieve the request's ControlList\n+ *\n+ * Return a reference to the ControlList that stores all the controls relevant\n+ * to this request.\n+ *\n+ * \\return A reference to the ControlList in this request\n+ */\n+\n /**\n * \\fn Request::buffers()\n * \\brief Retrieve the request's streams to buffers map\n@@ -158,6 +168,9 @@ void Request::complete(Status status)\n {\n \tASSERT(!hasPendingBuffers());\n \tstatus_ = status;\n+\n+\t/* Controls are 'per-frame' and not re-usable */\n+\tcontrols_.clear();\n }\n \n /**\n","prefixes":["libcamera-devel","v3","07/14"]}