From patchwork Fri Feb 8 14:45:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 551 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 823016101F for ; Fri, 8 Feb 2019 15:45:45 +0100 (CET) Received: from pendragon.ideasonboard.com (d51A4137F.access.telenet.be [81.164.19.127]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F23572E4 for ; Fri, 8 Feb 2019 15:45:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1549637145; bh=kkYP1rswu/B3HjKfSzc+NMur8lmJWJrBBeSgpRs76AA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=tcxMIRD+jevS+s0f8AWJBFFklKhwEcQdv4Ixw7xs3qVAtZ0B6z6SS3mzgILP9Jkv9 9ulqj/+DltpkawofhaBKHyct+y12kGEc0QSDEuMyuzLZYqXKSQXmzIiUjVMlWSTwaY c1Bzl2PKuPWMte32pVFh5fCXu0pVnwjCsS4pU7t4= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 8 Feb 2019 16:45:40 +0200 Message-Id: <20190208144540.15529-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190208144540.15529-1-laurent.pinchart@ideasonboard.com> References: <20190208144540.15529-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] libcamera: v4l2_device: Inherit from Loggable to print device node name X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Feb 2019 14:45:45 -0000 Automate printing of device node name in log messages by inheriting from the Loggable class. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/include/v4l2_device.h | 7 ++++++- src/libcamera/v4l2_device.cpp | 16 +++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h index 988e646c5de1..983b9d900aea 100644 --- a/src/libcamera/include/v4l2_device.h +++ b/src/libcamera/include/v4l2_device.h @@ -15,6 +15,8 @@ #include +#include "log.h" + namespace libcamera { class Buffer; @@ -76,7 +78,7 @@ public: unsigned int planesCount; }; -class V4L2Device +class V4L2Device : protected Loggable { public: explicit V4L2Device(const std::string &deviceNode); @@ -106,6 +108,9 @@ public: int streamOn(); int streamOff(); +protected: + std::string logPrefix() const; + private: int getFormatSingleplane(V4L2DeviceFormat *format); int setFormatSingleplane(V4L2DeviceFormat *format); diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 64325ff9f5d9..23c0da295905 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -262,8 +262,7 @@ int V4L2Device::open() if (ret < 0) { ret = -errno; LOG(V4L2, Error) - << "Failed to open V4L2 device '" << deviceNode_ - << "': " << strerror(-ret); + << "Failed to open V4L2 device: " << strerror(-ret); return ret; } fd_ = ret; @@ -278,9 +277,8 @@ int V4L2Device::open() } LOG(V4L2, Debug) - << "Opened '" << deviceNode_ << "' " - << caps_.bus_info() << ": " << caps_.driver() - << ": " << caps_.card(); + << "Opened device " << caps_.bus_info() << ": " + << caps_.driver() << ": " << caps_.card(); if (!caps_.isCapture() && !caps_.isOutput()) { LOG(V4L2, Debug) << "Device is not a supported type"; @@ -350,6 +348,11 @@ void V4L2Device::close() * \return The string containing the device location */ +std::string V4L2Device::logPrefix() const +{ + return deviceNode_; +} + /** * \brief Retrieve the image format set on the V4L2 device * \param[out] format The image format applied on the device @@ -519,8 +522,7 @@ int V4L2Device::requestBuffers(unsigned int count) return ret; } - LOG(V4L2, Debug) - << deviceNode_ << ":" << rb.count << " buffers requested."; + LOG(V4L2, Debug) << rb.count << " buffers requested."; return rb.count; }