From patchwork Fri Apr 29 21:23:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15758 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 E95DBC326D for ; Fri, 29 Apr 2022 21:23:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7CF906564A; Fri, 29 Apr 2022 23:23:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1651267438; bh=W76n6HoevJoFngdULGEdm7WOQ2oOHCc3vwuiacl57so=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=i7moMaLhBKUGNh0QMBZm9XxI25JxA5WpBbPL1dwr+iuTMkIXeUfl3HebjHzsH8McD cUMnTxLfxotuzI8Fr0rIA8OM+VXxc/IuNYGF5gRv6v4ng2xxNL7XGszLyZ9NEIPxjq FxQ2IAyu5q0Lr86fmd2kSqms+68AheTDEFSsY1joIQenAA0wqQxy/iwm/ztgT6Fpuk UhaQ6iNn71+kqS1jdxKXHiFZbGBpAx5p+O/1WTAxXBtfh6wlgUl19i6nqIyl5hh3rK VRWCga4SJZLJ42IfgLETjk5T3LpR3d9InMeFFPbGnmdvrABxvJ4cbmeM0zGBElZgkQ rMV2zbu8rlllQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B77EB65648 for ; Fri, 29 Apr 2022 23:23:54 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="gvmuhQlC"; dkim-atps=neutral Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4B0058EB; Fri, 29 Apr 2022 23:23:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1651267434; bh=W76n6HoevJoFngdULGEdm7WOQ2oOHCc3vwuiacl57so=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gvmuhQlCoI0DPq3BagAPCiOlb2fo7OJBCGLX1LL8s9p7k2DaSYT3WQxV7L6HB37E5 FcGRsSdDWW2GR+qV0ECQwfVFSLrXyj1hjI5wFEJZiSFCutTrtIGAasRDfhuI5DgDzX s0ZDhgiGIjK07+GlwqhWqLMlkUfcSW5zq3GUBQpo= To: libcamera-devel@lists.libcamera.org Date: Sat, 30 Apr 2022 00:23:47 +0300 Message-Id: <20220429212348.18063-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429212348.18063-1-laurent.pinchart@ideasonboard.com> References: <20220429212348.18063-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 4/5] libcamera: Add operator<<() for V4L2 format classes 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-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Implement the stream output operator<<() for the V4L2DeviceFormat and V4L2SubdeviceFormat classes to simplify printing them. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- include/libcamera/internal/v4l2_subdevice.h | 3 ++ include/libcamera/internal/v4l2_videodevice.h | 3 ++ src/libcamera/v4l2_subdevice.cpp | 34 +++++++++++++------ src/libcamera/v4l2_videodevice.cpp | 16 ++++++++- 4 files changed, 45 insertions(+), 11 deletions(-) diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h index 58d1e5114e7b..6fda52ada41b 100644 --- a/include/libcamera/internal/v4l2_subdevice.h +++ b/include/libcamera/internal/v4l2_subdevice.h @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -35,6 +36,8 @@ struct V4L2SubdeviceFormat { uint8_t bitsPerPixel() const; }; +std::ostream &operator<<(std::ostream &out, const V4L2SubdeviceFormat &f); + class V4L2Subdevice : public V4L2Device { public: diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h index 9c9493cc16ed..23f37f83f8e2 100644 --- a/include/libcamera/internal/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -180,6 +181,8 @@ public: const std::string toString() const; }; +std::ostream &operator<<(std::ostream &out, const V4L2DeviceFormat &f); + class V4L2VideoDevice : public V4L2Device { public: diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index d5ae460571d8..b3d0ddad83db 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -190,17 +190,10 @@ const std::map formatInfoMap = { */ const std::string V4L2SubdeviceFormat::toString() const { - std::stringstream mbus; - mbus << size << "-"; + std::stringstream ss; + ss << *this; - const auto it = formatInfoMap.find(mbus_code); - - if (it == formatInfoMap.end()) - mbus << utils::hex(mbus_code, 4); - else - mbus << it->second.name; - - return mbus.str(); + return ss.str(); } /** @@ -220,6 +213,27 @@ uint8_t V4L2SubdeviceFormat::bitsPerPixel() const return it->second.bitsPerPixel; } +/** + * \brief Insert a text representation of a V4L2SubdeviceFormat into an output + * stream + * \param[in] out The output stream + * \param[in] f The V4L2SubdeviceFormat + * \return The output stream \a out + */ +std::ostream &operator<<(std::ostream &out, const V4L2SubdeviceFormat &f) +{ + out << f.size << "-"; + + const auto it = formatInfoMap.find(f.mbus_code); + + if (it == formatInfoMap.end()) + out << utils::hex(f.mbus_code, 4); + else + out << it->second.name; + + return out; +} + /** * \class V4L2Subdevice * \brief A V4L2 subdevice as exposed by the Linux kernel diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 5ba866ad71bb..5b4637b1a39e 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -433,10 +433,24 @@ bool V4L2BufferCache::Entry::operator==(const FrameBuffer &buffer) const const std::string V4L2DeviceFormat::toString() const { std::stringstream ss; - ss << size << "-" << fourcc.toString(); + ss << *this; + return ss.str(); } +/** + * \brief Insert a text representation of a V4L2DeviceFormat into an output + * stream + * \param[in] out The output stream + * \param[in] f The V4L2DeviceFormat + * \return The output stream \a out + */ +std::ostream &operator<<(std::ostream &out, const V4L2DeviceFormat &f) +{ + out << f.size << "-" << f.fourcc; + return out; +} + /** * \class V4L2VideoDevice * \brief V4L2VideoDevice object and API