From patchwork Fri Jul 3 18:02:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 11642601 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 09A4E14B7 for ; Fri, 3 Jul 2020 18:03:01 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D6D5621D79 for ; Fri, 3 Jul 2020 18:03:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="wGXFba3n" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6D5621D79 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YOLD8CpRas6IbWPwwi5WPm8Uh+FKwjCtChD9rTvqi7s=; b=wGXFba3nuCqZcnwJMTRl99QOEj 6h+eB4fvv2N5W7j491ALKDUqL6r69OR9Y6A5Jp5VkfgD/nAnhw6HykJ4lBvXWtyCclB5vY69RwsjW PEyCQNKYhnqLIp93kSAGWPoHSDc9AJj3pEoPl4I8kZIAdz+xjy4pqTvAbO/aUcDvSD5qVFwx7KQ0o w5g4NlOtWY4JM4eaPz/vJ+0T6lhwJWF7oDLuwbi0IRflbRMei02gpILhL3Pu53cYTjiQaMVtG7ogX /e8FJxeLYbBr0XhAKgFK4LEAxUgJG2hXejAuKpQcZF5uln76peZKviLbYI21TnZ2FRTX7ihAlgYPo /5RMPIOw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrQ1a-0003Jn-I4; Fri, 03 Jul 2020 18:02:58 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrQ1U-0003En-2c for linux-rockchip@lists.infradead.org; Fri, 03 Jul 2020 18:02:53 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: dafna) with ESMTPSA id A4D262A6505 From: Dafna Hirschfeld To: linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com Subject: [PATCH v4l-utils v5 2/4] v4l2: common: add the flags V4L2_FMT_FLAG_CSC* to the list that maps flags to str Date: Fri, 3 Jul 2020 20:02:37 +0200 Message-Id: <20200703180239.25841-3-dafna.hirschfeld@collabora.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200703180239.25841-1-dafna.hirschfeld@collabora.com> References: <20200703180239.25841-1-dafna.hirschfeld@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200703_140252_242797_85E9DF1A X-CRM114-Status: GOOD ( 10.31 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mchehab@kernel.org, dafna.hirschfeld@collabora.com, dafna3@gmail.com, tfiga@chromium.org, hverkuil@xs4all.nl, linux-rockchip@lists.infradead.org, helen.koike@collabora.com, sakari.ailus@linux.intel.com, kernel@collabora.com, ezequiel@collabora.com MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Replace the array fmtdesc_def with a macro 'FMTDESC_DEF' The macro is used to to create two arrays 'fmtdesc_def_ycbcr', 'fmtdesc_def_hsv' that map the format flags to strings. The function 'fmtdesc2s' is changed to get a parameter 'is_hsv' that decides which array to use. The new CSC flags V4L2_FMT_FLAG_CSC* are added to the arries. Signed-off-by: Dafna Hirschfeld --- utils/common/v4l2-info.cpp | 28 +++++++++++++++++++--------- utils/common/v4l2-info.h | 2 +- utils/v4l2-ctl/v4l2-ctl.cpp | 16 ++++++++++++---- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/utils/common/v4l2-info.cpp b/utils/common/v4l2-info.cpp index 16be409a..a8fa6236 100644 --- a/utils/common/v4l2-info.cpp +++ b/utils/common/v4l2-info.cpp @@ -366,18 +366,28 @@ std::string service2s(unsigned service) return flags2s(service, service_def); } -static const flag_def fmtdesc_def[] = { - { V4L2_FMT_FLAG_COMPRESSED, "compressed" }, - { V4L2_FMT_FLAG_EMULATED, "emulated" }, - { V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM, "continuous-bytestream" }, - { V4L2_FMT_FLAG_DYN_RESOLUTION, "dyn-resolution" }, - { V4L2_FMT_FLAG_ENC_CAP_FRAME_INTERVAL, "enc-cap-frame-interval" }, - { 0, NULL } +#define FMTDESC_DEF(enc_type) \ +static const flag_def fmtdesc_ ## enc_type ## _def[] = { \ + { V4L2_FMT_FLAG_COMPRESSED, "compressed" }, \ + { V4L2_FMT_FLAG_EMULATED, "emulated" }, \ + { V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM, "continuous-bytestream" }, \ + { V4L2_FMT_FLAG_DYN_RESOLUTION, "dyn-resolution" }, \ + { V4L2_FMT_FLAG_ENC_CAP_FRAME_INTERVAL, "enc-cap-frame-interval" }, \ + { V4L2_FMT_FLAG_CSC_COLORSPACE, "csc-colorspace" }, \ + { V4L2_FMT_FLAG_CSC_YCBCR_ENC, "csc-"#enc_type }, \ + { V4L2_FMT_FLAG_CSC_QUANTIZATION, "csc-quantization" }, \ + { V4L2_FMT_FLAG_CSC_XFER_FUNC, "csc-xfer-func" }, \ + { 0, NULL } \ }; -std::string fmtdesc2s(unsigned flags) +FMTDESC_DEF(ycbcr) +FMTDESC_DEF(hsv) + +std::string fmtdesc2s(unsigned flags, bool is_hsv) { - return flags2s(flags, fmtdesc_def); + if (is_hsv) + return flags2s(flags, fmtdesc_hsv_def); + return flags2s(flags, fmtdesc_ycbcr_def); } static const flag_def selection_targets_def[] = { diff --git a/utils/common/v4l2-info.h b/utils/common/v4l2-info.h index ce2600f0..5b34409c 100644 --- a/utils/common/v4l2-info.h +++ b/utils/common/v4l2-info.h @@ -51,7 +51,7 @@ std::string pixflags2s(unsigned flags); std::string service2s(unsigned service); /* Return v4l2_fmtdesc flags description */ -std::string fmtdesc2s(unsigned flags); +std::string fmtdesc2s(unsigned flags, bool is_hsv); /* Return selection flags description */ std::string selflags2s(__u32 flags); diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp index 4972591e..edac19f1 100644 --- a/utils/v4l2-ctl/v4l2-ctl.cpp +++ b/utils/v4l2-ctl/v4l2-ctl.cpp @@ -615,8 +615,12 @@ void print_video_formats(cv4l_fd &fd, __u32 type) do { printf("\t[%d]: '%s' (%s", fmt.index, fcc2s(fmt.pixelformat).c_str(), fmt.description); - if (fmt.flags) - printf(", %s", fmtdesc2s(fmt.flags).c_str()); + if (fmt.flags) { + bool is_hsv = fmt.pixelformat == V4L2_PIX_FMT_HSV24 || + fmt.pixelformat == V4L2_PIX_FMT_HSV32; + + printf(", %s", fmtdesc2s(fmt.flags, is_hsv).c_str()); + } printf(")\n"); } while (!fd.enum_fmt(fmt)); } @@ -634,8 +638,12 @@ void print_video_formats_ext(cv4l_fd &fd, __u32 type) do { printf("\t[%d]: '%s' (%s", fmt.index, fcc2s(fmt.pixelformat).c_str(), fmt.description); - if (fmt.flags) - printf(", %s", fmtdesc2s(fmt.flags).c_str()); + if (fmt.flags) { + bool is_hsv = fmt.pixelformat == V4L2_PIX_FMT_HSV24 || + fmt.pixelformat == V4L2_PIX_FMT_HSV32; + + printf(", %s", fmtdesc2s(fmt.flags, is_hsv).c_str()); + } printf(")\n"); if (fd.enum_framesizes(frmsize, fmt.pixelformat)) continue;