From patchwork Tue May 26 14:22:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 3860 Return-Path: Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EA68F60E08 for ; Tue, 26 May 2020 16:19:24 +0200 (CEST) X-Originating-IP: 2.224.242.101 Received: from localhost.localdomain (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 7999D4000B; Tue, 26 May 2020 14:19:24 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Tue, 26 May 2020 16:22:30 +0200 Message-Id: <20200526142237.407557-2-jacopo@jmondi.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526142237.407557-1-jacopo@jmondi.org> References: <20200526142237.407557-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/8] android: camera_device: Provide log prefix 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: , X-List-Received-Date: Tue, 26 May 2020 14:19:25 -0000 Make the CameraDevice a Loggable subclass and provide a logPrefix() method to identify which camera the log outout refers to. Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/android/camera_device.cpp | 5 +++++ src/android/camera_device.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 4ec429fc3f8f..ad277cb059ca 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -863,6 +863,11 @@ void CameraDevice::requestComplete(Request *request) delete buffer; } +std::string CameraDevice::logPrefix() const +{ + return "'" + camera_->name() + "'"; +} + void CameraDevice::notifyShutter(uint32_t frameNumber, uint64_t timestamp) { camera3_notify_msg_t notify = {}; diff --git a/src/android/camera_device.h b/src/android/camera_device.h index bce1cfbc85a4..350408c1a3e4 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -16,11 +16,12 @@ #include #include +#include "libcamera/internal/log.h" #include "libcamera/internal/message.h" class CameraMetadata; -class CameraDevice +class CameraDevice : protected libcamera::Loggable { public: CameraDevice(unsigned int id, const std::shared_ptr &camera); @@ -39,6 +40,9 @@ public: int processCaptureRequest(camera3_capture_request_t *request); void requestComplete(libcamera::Request *request); +protected: + std::string logPrefix() const; + private: struct Camera3RequestDescriptor { Camera3RequestDescriptor(unsigned int frameNumber,