From patchwork Fri Apr 29 21:23:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15757 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 77F2DC326C 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 94E5C6564D; Fri, 29 Apr 2022 23:23:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1651267437; bh=EFYgJqN43/rpkMEshDR1KwiP44TUYutlYEWmQsCPi8U=; 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=b6DabLdM2jPyKcxl8P+ktZ/b0TTQ+K4WUo8HcOYfDIrPNTMqrImpNClwA0Grc8ewO bw0EJfJSDCwQrTU3Dx5/8J82ZjXo6TeNrkGauATZRvG9ouK0Vln+YDth8/I7uzrtWC SNkj1EY8xgKBD+4OyD9DjIBqFCEqqU3jbWql2tbu9Kbkd6DezbsBYOMW8VWnO2LiyK mXIZIcAycr9FViGZuAtuIqfcBkbpKYeLY0k5xdNMaHKPJ3XODYmGkbZLZZ5/CSCDbQ nFivCzN1GVCBpJK3AjPvLYwvfGxn/Ba0UU08SCwaxOAMENclUcqw+N/qGp5HgkkjTP qZmLPLhEGXLQg== 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 22F1C65640 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="AuXv9GlM"; 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 AC586496; Fri, 29 Apr 2022 23:23:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1651267433; bh=EFYgJqN43/rpkMEshDR1KwiP44TUYutlYEWmQsCPi8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AuXv9GlMlJLmfQBfAF1mOWZzuMPLqlPOdVzeYncmPhKcxXm4kAVMvAcSVFLrOaxN8 7Pj66WRJhTo/kbYo/wi74kwCKTJevoBap3422bsCIVDIhpJqcHExz8S/dBJcEz/7K2 5Ur+XJ3+370KT6yW8cLwOqeiblawBaEOzyGzNQM0= To: libcamera-devel@lists.libcamera.org Date: Sat, 30 Apr 2022 00:23:46 +0300 Message-Id: <20220429212348.18063-4-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 3/5] libcamera: bayer_format: Add operator<<() 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 BayerFormat class to simplify printing them. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- include/libcamera/internal/bayer_format.h | 3 ++ src/libcamera/bayer_format.cpp | 57 ++++++++++++++--------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/include/libcamera/internal/bayer_format.h b/include/libcamera/internal/bayer_format.h index cb20bf9bea84..7d3e37c67e9c 100644 --- a/include/libcamera/internal/bayer_format.h +++ b/include/libcamera/internal/bayer_format.h @@ -7,6 +7,7 @@ #pragma once +#include #include #include @@ -68,4 +69,6 @@ static inline bool operator!=(const BayerFormat &lhs, const BayerFormat &rhs) return !(lhs == rhs); } +std::ostream &operator<<(std::ostream &out, const BayerFormat &f); + } /* namespace libcamera */ diff --git a/src/libcamera/bayer_format.cpp b/src/libcamera/bayer_format.cpp index 9aaec0bce264..4882707e7763 100644 --- a/src/libcamera/bayer_format.cpp +++ b/src/libcamera/bayer_format.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -236,28 +237,10 @@ const BayerFormat &BayerFormat::fromMbusCode(unsigned int mbusCode) */ std::string BayerFormat::toString() const { - std::string result; + std::stringstream ss; + ss << *this; - static const char *orderStrings[] = { - "BGGR", - "GBRG", - "GRBG", - "RGGB", - "MONO" - }; - if (isValid() && order <= MONO) - result = orderStrings[order]; - else - return "INVALID"; - - result += "-" + std::to_string(bitDepth); - - if (packing == Packing::CSI2) - result += "-CSI2P"; - else if (packing == Packing::IPU3) - result += "-IPU3P"; - - return result; + return ss.str(); } /** @@ -270,6 +253,38 @@ bool operator==(const BayerFormat &lhs, const BayerFormat &rhs) lhs.packing == rhs.packing; } +/** + * \brief Insert a text representation of a BayerFormats into an output stream + * \param[in] out The output stream + * \param[in] f The BayerFormat + * \return The output stream \a out + */ +std::ostream &operator<<(std::ostream &out, const BayerFormat &f) +{ + static const char *orderStrings[] = { + "BGGR-", + "GBRG-", + "GRBG-", + "RGGB-", + "MONO-" + }; + + if (!f.isValid() || f.order > BayerFormat::MONO) { + out << "INVALID"; + return out; + } + + /* The cast is required to avoid bitDepth being interpreted as a char. */ + out << orderStrings[f.order] << static_cast(f.bitDepth); + + if (f.packing == BayerFormat::Packing::CSI2) + out << "-CSI2P"; + else if (f.packing == BayerFormat::Packing::IPU3) + out << "-IPU3P"; + + return out; +} + /** * \fn bool operator!=(const BayerFormat &lhs, const BayerFormat &rhs) * \brief Compare two BayerFormats for inequality