From patchwork Mon Aug 10 23:45:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 9287 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 8CBE0BD87E for ; Mon, 10 Aug 2020 23:45:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B8C6E610A9; Tue, 11 Aug 2020 01:45:37 +0200 (CEST) Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4002A60D5B for ; Tue, 11 Aug 2020 01:45:35 +0200 (CEST) X-Halon-ID: 9536d807-db63-11ea-92dc-005056917a89 Authorized-sender: niklas.soderlund@fsdn.se Received: from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de [84.172.82.168]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id 9536d807-db63-11ea-92dc-005056917a89; Tue, 11 Aug 2020 01:45:34 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Tue, 11 Aug 2020 01:45:27 +0200 Message-Id: <20200810234528.1678143-2-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810234528.1678143-1-niklas.soderlund@ragnatech.se> References: <20200810234528.1678143-1-niklas.soderlund@ragnatech.se> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] libcamera: request: Declare a using directive for map of buffers X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Declare a using directive for the map of Stream to FrameBuffer. Update all users of Request::buffers() to use the new usage directive. Signed-off-by: Niklas Söderlund Reviewed-by: Kieran Bingham --- include/libcamera/request.h | 6 ++++-- src/android/camera_device.cpp | 2 +- src/cam/capture.cpp | 2 +- src/libcamera/request.cpp | 5 +++++ src/qcam/main_window.h | 4 ++-- test/camera/buffer_import.cpp | 2 +- test/camera/capture.cpp | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/include/libcamera/request.h b/include/libcamera/request.h index eded68318b7dbb3c..e74f56a7d6415315 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -31,6 +31,8 @@ public: RequestCancelled, }; + using BufferMap = std::map; + Request(Camera *camera, uint64_t cookie = 0); Request(const Request &) = delete; Request &operator=(const Request &) = delete; @@ -38,7 +40,7 @@ public: ControlList &controls() { return *controls_; } ControlList &metadata() { return *metadata_; } - const std::map &buffers() const { return bufferMap_; } + const BufferMap &buffers() const { return bufferMap_; } int addBuffer(Stream *stream, FrameBuffer *buffer); FrameBuffer *findBuffer(Stream *stream) const; @@ -58,7 +60,7 @@ private: CameraControlValidator *validator_; ControlList *controls_; ControlList *metadata_; - std::map bufferMap_; + BufferMap bufferMap_; std::unordered_set pending_; const uint64_t cookie_; diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index d9183501228f4642..3419236a061cba57 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1371,7 +1371,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques void CameraDevice::requestComplete(Request *request) { - const std::map &buffers = request->buffers(); + const Request::BufferMap &buffers = request->buffers(); camera3_buffer_status status = CAMERA3_BUFFER_STATUS_OK; std::unique_ptr resultMetadata; Camera3RequestDescriptor *descriptor = diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp index 3d8e89d52c7ab68d..0720376983470f2f 100644 --- a/src/cam/capture.cpp +++ b/src/cam/capture.cpp @@ -157,7 +157,7 @@ void Capture::requestComplete(Request *request) if (request->status() == Request::RequestCancelled) return; - const std::map &buffers = request->buffers(); + const Request::BufferMap &buffers = request->buffers(); std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now(); double fps = std::chrono::duration_cast(now - last_).count(); diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index f3753514131ae394..d5f11e8c43c32766 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -37,6 +37,11 @@ LOG_DEFINE_CATEGORY(Request) * The request has been cancelled due to capture stop */ +/** + * \typedef Request::BufferMap + * \brief A map of Stream to FrameBuffer pointers + */ + /** * \class Request * \brief A frame capture request diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 4606fe487ad49777..6e1bcd76a2438b4c 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -47,13 +47,13 @@ public: { } - CaptureRequest(const std::map &buffers, + CaptureRequest(const Request::BufferMap &buffers, const ControlList &metadata) : buffers_(buffers), metadata_(metadata) { } - std::map buffers_; + Request::BufferMap buffers_; ControlList metadata_; }; diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index 46e03746213912aa..726d2cb2fe757066 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -46,7 +46,7 @@ protected: if (request->status() != Request::RequestComplete) return; - const std::map &buffers = request->buffers(); + const Request::BufferMap &buffers = request->buffers(); completeRequestsCount_++; diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp index ea84daeef196e349..ae572eb955753151 100644 --- a/test/camera/capture.cpp +++ b/test/camera/capture.cpp @@ -39,7 +39,7 @@ protected: if (request->status() != Request::RequestComplete) return; - const std::map &buffers = request->buffers(); + const Request::BufferMap &buffers = request->buffers(); completeRequestsCount_++;