From patchwork Wed Apr 21 07:20:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 425492 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE0D5C433B4 for ; Wed, 21 Apr 2021 07:20:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6426461427 for ; Wed, 21 Apr 2021 07:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235083AbhDUHVL (ORCPT ); Wed, 21 Apr 2021 03:21:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232194AbhDUHVK (ORCPT ); Wed, 21 Apr 2021 03:21:10 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CD7AC06174A for ; Wed, 21 Apr 2021 00:20:38 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id h20so21131296plr.4 for ; Wed, 21 Apr 2021 00:20:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8kAAOsS/FtGPnyLMlTHYD0eKa7nIeeaFOaw4EILg7ps=; b=Mj5fbrbEX4bmxQzxcGbCZV3s5oCVNGkLH1z6XdemvV8RKjdyQAP+3ZoqELNXz9wyih pGPc4LLjgrNIdXNQZSbfBosI4khGQ0AGhT5HlxjdbpB9Qfnh/0SL6TW1zPDd7tU6QD9p 2FRumCwQEEoIrqdfQL7dZKQPshNttYgbKKWkuMdwyUbk2rFKbCeq1pIRFDeAmwwIVrqu /6Vqn9pe4MpYjLx/JupaHCHseBRShp//apHpy/P+7BJxZbs/KfS9/TqR25NrDk0CfIHD pC46fewHYVJ9/bJ8lbvxcaLkCgQXsuPxKnHMTd8cyRYVGDTE7Tqo78DEa/oDdDCrXHZE mk6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8kAAOsS/FtGPnyLMlTHYD0eKa7nIeeaFOaw4EILg7ps=; b=FbUJ5a2YLQyc41Luw52I1MQSBuy/ydvnYkimRcqqv96npqxEqnobY7Of151QP3KDRQ WMVGVGVJetUzIVJYl/ibwFsnpDPJkQ5Nx5H1sxyY+fZKWLSg9TCSAL8fZq3NE1C1iQ8p CuJDdlOKt2vIa51zPyfrNS8h3TsjqLOkjxKEOIQg0cTMueT/H8hd/hNznBQpHPgsYFWz 662/FbKAoCi77PKGha4lB80tzcKnY8XLmRratle6mafEtfP9hHqGZ/3uzF51g/Fp/o0g Ev25aN0iJu5JJ/FmNY/GEnHOh3LavygMDq9SmgjTo6jGvhMkeX4UhDq5OtonlyP1Cc5P PYdQ== X-Gm-Message-State: AOAM533TU0aityoRymto2I+waygXcW2lMoRAPn7LDtjOOA59bnua/R9p 6Ykwdk1FhsImG7VTAtAaJE0Bbd+SZL2vzQ== X-Google-Smtp-Source: ABdhPJxYyWuvaZ6b6uOKXdGNbJNWKz7b6HB5PtrPkV0nX8CxtDicDqB45bvtUJV1shPIWIsN80mCYA== X-Received: by 2002:a17:902:b08a:b029:ec:af20:5602 with SMTP id p10-20020a170902b08ab02900ecaf205602mr11468570plr.71.1618989637267; Wed, 21 Apr 2021 00:20:37 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id p10sm907815pfo.210.2021.04.21.00.20.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 00:20:36 -0700 (PDT) From: Rosen Penev To: linux-media@vger.kernel.org Subject: [PATCH 1/8] clang-tidy: use auto Date: Wed, 21 Apr 2021 00:20:28 -0700 Message-Id: <20210421072035.4188497-1-rosenp@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Found with modernize-use-auto Signed-off-by: Rosen Penev --- utils/cec-ctl/cec-ctl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/cec-ctl/cec-ctl.cpp b/utils/cec-ctl/cec-ctl.cpp index 107dcfab2..c17265a5c 100644 --- a/utils/cec-ctl/cec-ctl.cpp +++ b/utils/cec-ctl/cec-ctl.cpp @@ -1833,7 +1833,7 @@ static __u16 parse_phys_addr_from_edid(const char *edid_path) static void *thread_edid_poll(void *arg) { - struct node *node = static_cast(arg); + auto node = static_cast(arg); __u16 phys_addr; bool has_edid; char dummy; From patchwork Wed Apr 21 07:20:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 425491 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 173B7C43461 for ; Wed, 21 Apr 2021 07:20:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4EC061004 for ; Wed, 21 Apr 2021 07:20:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235529AbhDUHVM (ORCPT ); Wed, 21 Apr 2021 03:21:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235421AbhDUHVL (ORCPT ); Wed, 21 Apr 2021 03:21:11 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A848C06174A for ; Wed, 21 Apr 2021 00:20:39 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id w10so28939567pgh.5 for ; Wed, 21 Apr 2021 00:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lsJQGiylJ8Q0fC63RMBRAV5F1QZambfdv6JDw+W5Fz4=; b=JBrlyViKYWS32H4lIdRNpWGj9x2qcatsTYVFyryLNEqriZn4U/lrcGuCAIbHOoiPIG zNGfjFqRoZOqtoghWdWUHQrGWLc1p5oZt4T1/p8o2443YCoSYiJZ611d6VmFJX5vjmq2 2HXtTnk9waZvb/5dz0fbLarnSeeTi/R/jAm/3mdIXimkbAZ3o74hKc0/IfRYVY6eW9JD vdpkaezR0Q9XYs7Yng8UIgskNDrlddyTwXOeSQrFMkH+mae0gpyChOsgWwZ0Ke5qENnK xIhLFt5+z88/APLX/m2pRiqiVUCUE3MJFbPaFIvwlQxIVZGCDQAkRlMR4Lum09aJJEQA j1pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lsJQGiylJ8Q0fC63RMBRAV5F1QZambfdv6JDw+W5Fz4=; b=HEscAK9z/H+LdOnOzZCIt34CbP6Uni2avSbAiLM3i4H2JERxE3oBwMS4l1cQtKBGjN l4PBu6KqAVJyqJrEIebGXfflen2+jWzMVlgRBe4ySzZWLpDBM9Y5cxZU0/0gDE97S8Yb Em4HHddGCWgvNIybaPuLFdzKCW2C4fKXSdkTnENLXskgMCmqMtQBZMkPvfG+AgQtK/FZ vbS0F6h1lkdpq+WvunAEnixnoA2e8D80Y8Ld7fdajmoflNLlVKkTCElImBNC+mAIDpY1 xP/QH6eKkwZaafJQOsAiKGPmCcMqe+2eKRp1nZDCFtSGEZoNyvi09v12ZIYH63WGxGIw pKbw== X-Gm-Message-State: AOAM532Htd/7oh9aOQCVSLCxtwO75J64CMOd6azzNufHftZ02Nrr/AOz /DocJJi28p2dQS80pI7TMcuNKrvxcMwW+g== X-Google-Smtp-Source: ABdhPJwJ/flYRx8nBn37/BzUmcDRW3MQcdEd0YKUW/7knMOQWY2/gmSYYm80sM+9Mn+h+JxyJScyJA== X-Received: by 2002:a63:5112:: with SMTP id f18mr13182556pgb.379.1618989638844; Wed, 21 Apr 2021 00:20:38 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id p10sm907815pfo.210.2021.04.21.00.20.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 00:20:38 -0700 (PDT) From: Rosen Penev To: linux-media@vger.kernel.org Subject: [PATCH 3/8] remove unused ARRAY_SIZE Date: Wed, 21 Apr 2021 00:20:30 -0700 Message-Id: <20210421072035.4188497-3-rosenp@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210421072035.4188497-1-rosenp@gmail.com> References: <20210421072035.4188497-1-rosenp@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This is a C construct that is not really needed in C++. Signed-off-by: Rosen Penev --- utils/cec-compliance/cec-compliance.h | 3 --- utils/cec-ctl/cec-pin.cpp | 2 -- utils/cec-follower/cec-follower.h | 3 --- utils/cec-follower/cec-processing.cpp | 3 --- utils/rds-ctl/rds-ctl.cpp | 2 -- 5 files changed, 13 deletions(-) diff --git a/utils/cec-compliance/cec-compliance.h b/utils/cec-compliance/cec-compliance.h index 26c70c216..c558f043b 100644 --- a/utils/cec-compliance/cec-compliance.h +++ b/utils/cec-compliance/cec-compliance.h @@ -191,9 +191,6 @@ using vec_remote_subtests = std::vector; #define CEC_LOG_ADDR_MASK_ALL 0xffff -#define ARRAY_SIZE(a) \ - (sizeof(a) / sizeof(*a)) - #define COLOR_GREEN(s) "\033[32m" s "\033[0m" #define COLOR_RED(s) "\033[1;31m" s "\033[0m" #define COLOR_BOLD(s) "\033[1m" s "\033[0m" diff --git a/utils/cec-ctl/cec-pin.cpp b/utils/cec-ctl/cec-pin.cpp index f9ecac7fb..30e5accf5 100644 --- a/utils/cec-ctl/cec-pin.cpp +++ b/utils/cec-ctl/cec-pin.cpp @@ -17,8 +17,6 @@ #include "cec-ctl.h" #include "cec-log.h" -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - static std::string find_opcode_name(__u8 opcode) { const char *name = cec_opcode2s(opcode); diff --git a/utils/cec-follower/cec-follower.h b/utils/cec-follower/cec-follower.h index 5b67a260f..7806a4b64 100644 --- a/utils/cec-follower/cec-follower.h +++ b/utils/cec-follower/cec-follower.h @@ -20,9 +20,6 @@ #include #include -#define ARRAY_SIZE(a) \ - (sizeof(a) / sizeof(*a)) - extern bool show_info; extern bool show_msgs; extern bool show_state; diff --git a/utils/cec-follower/cec-processing.cpp b/utils/cec-follower/cec-processing.cpp index 83ffcc30b..024407471 100644 --- a/utils/cec-follower/cec-processing.cpp +++ b/utils/cec-follower/cec-processing.cpp @@ -29,9 +29,6 @@ /* Time between each polling message sent to a device */ #define POLL_PERIOD 15000 -#define ARRAY_SIZE(a) \ - (sizeof(a) / sizeof(*a)) - struct cec_enum_values { const char *type_name; __u8 value; diff --git a/utils/rds-ctl/rds-ctl.cpp b/utils/rds-ctl/rds-ctl.cpp index e27182821..8161aa453 100644 --- a/utils/rds-ctl/rds-ctl.cpp +++ b/utils/rds-ctl/rds-ctl.cpp @@ -27,8 +27,6 @@ #include #include -#define ARRAY_SIZE(arr) ((int)(sizeof(arr) / sizeof((arr)[0]))) - using dev_vec = std::vector; using dev_map = std::map; From patchwork Wed Apr 21 07:20:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 425490 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA297C43460 for ; Wed, 21 Apr 2021 07:20:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7974461427 for ; Wed, 21 Apr 2021 07:20:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236731AbhDUHVP (ORCPT ); Wed, 21 Apr 2021 03:21:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235421AbhDUHVO (ORCPT ); Wed, 21 Apr 2021 03:21:14 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E573AC06138B for ; Wed, 21 Apr 2021 00:20:41 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id h20so21131375plr.4 for ; Wed, 21 Apr 2021 00:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=81mtl71VNVXeAc/LoEtGnqgE0rmQcWx1oL6lnTpYEFU=; b=QwG7E9c5A70MtmjERKJ5WBTNZFDnhROkoY3yRJjTbVcbrGfjMRdwfMFeXscQ9McdOd jIPkKkWq093RBWv+VGgLWSo2cjJZPnWcoDhR3a7GLD+2MrjUf05G7jfx6qjupNAMzjH+ qP8MK4N5z16LEpmr2VP0Bym0+6dlXhTqemm7CYTwGVwigVqWRUDrmIG6fm3x6yixweCy DOiHYjXYV5bjmYyVuh8+X9xpxawyZ7pA5l7Jaa81s3srHmY/Sg251Fdp5YD6Z0jgQ3v8 2b+ukt1TsIqWzi477ci3mPXpvWAC7HDpmeQI4K24M59Ck0aYPtOlvfD1geDx16u77cAL eO5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=81mtl71VNVXeAc/LoEtGnqgE0rmQcWx1oL6lnTpYEFU=; b=R8UdOQ43iovj+4QGpNOJHtyBkbA3GjK0DHY1qp32V4+/i8R987WAFAyZVRj1dk3AiU 6V2jbAXqllVp3cC6S0baRdMKYXZQlI4ssysfGvmw2oK67n/xuI+qqLFzAJmLFIhuYcU8 RYum3zHUYy1kZz+0ZuxwvyowAzfyX0Sd+/an3mfyHOsIL1xSXzgfmUrFqqzdMy5qPps1 CyFY6UYwLmgTUhPLyAqC1zCMCxxTilhpRD7hLTH5ZHEWnwF2T7N94wLT1wqKIqXYgh9K urplWdjp5/V3NLWEmQ26dRr+cGqNrIAQAYnwNK1f9x55Bsd1MkO/GmdFPmBn2WRClZDG nQLA== X-Gm-Message-State: AOAM533mUw+2A7I2HOilqWiTfBI+ZQs7GVxCj291NG8As2nLWqP1NtPi rAeuL8jfn/M9WGe0UZFKKgHDC0KFJQPeIg== X-Google-Smtp-Source: ABdhPJy1CKPfxPbcSR7ooV6VcAtd9vL1G058fdmjvZTMkosWtkKMQIb5sTx+8S/IL/avKn02tGeSvA== X-Received: by 2002:a17:902:8bcb:b029:ec:a192:21cf with SMTP id r11-20020a1709028bcbb02900eca19221cfmr16156239plo.71.1618989641246; Wed, 21 Apr 2021 00:20:41 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id p10sm907815pfo.210.2021.04.21.00.20.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 00:20:40 -0700 (PDT) From: Rosen Penev To: linux-media@vger.kernel.org Subject: [PATCH 6/8] v4l2-utils: turn fb_formats to constexpr array Date: Wed, 21 Apr 2021 00:20:33 -0700 Message-Id: <20210421072035.4188497-6-rosenp@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210421072035.4188497-1-rosenp@gmail.com> References: <20210421072035.4188497-1-rosenp@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Forces evaluation at compile time and allows usage of a for range loop. Signed-off-by: Rosen Penev --- utils/v4l2-ctl/v4l2-ctl-overlay.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/utils/v4l2-ctl/v4l2-ctl-overlay.cpp b/utils/v4l2-ctl/v4l2-ctl-overlay.cpp index 09de70c85..639a41757 100644 --- a/utils/v4l2-ctl/v4l2-ctl-overlay.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-overlay.cpp @@ -1,3 +1,4 @@ +#include #include #include @@ -121,16 +122,15 @@ struct bitfield2fmt { __u32 pixfmt; }; -static const struct bitfield2fmt fb_formats[] = { - { 10, 5, 5, 5, 0, 5, 15, 1, V4L2_PIX_FMT_ARGB555 }, - { 11, 5, 5, 6, 0, 5, 0, 0, V4L2_PIX_FMT_RGB565 }, - { 1, 5, 6, 5, 11, 5, 0, 1, V4L2_PIX_FMT_RGB555X }, - { 0, 5, 5, 6, 11, 5, 0, 0, V4L2_PIX_FMT_RGB565X }, - { 16, 8, 8, 8, 0, 8, 0, 0, V4L2_PIX_FMT_BGR24 }, - { 0, 8, 8, 8, 16, 8, 0, 0, V4L2_PIX_FMT_RGB24 }, - { 16, 8, 8, 8, 0, 8, 24, 8, V4L2_PIX_FMT_ABGR32 }, - { 8, 8, 16, 8, 24, 8, 0, 8, V4L2_PIX_FMT_ARGB32 }, - { } +static constexpr std::array fb_formats{ + bitfield2fmt{ 10, 5, 5, 5, 0, 5, 15, 1, V4L2_PIX_FMT_ARGB555 }, + bitfield2fmt{ 11, 5, 5, 6, 0, 5, 0, 0, V4L2_PIX_FMT_RGB565 }, + bitfield2fmt{ 1, 5, 6, 5, 11, 5, 0, 1, V4L2_PIX_FMT_RGB555X }, + bitfield2fmt{ 0, 5, 5, 6, 11, 5, 0, 0, V4L2_PIX_FMT_RGB565X }, + bitfield2fmt{ 16, 8, 8, 8, 0, 8, 0, 0, V4L2_PIX_FMT_BGR24 }, + bitfield2fmt{ 0, 8, 8, 8, 16, 8, 0, 0, V4L2_PIX_FMT_RGB24 }, + bitfield2fmt{ 16, 8, 8, 8, 0, 8, 24, 8, V4L2_PIX_FMT_ABGR32 }, + bitfield2fmt{ 8, 8, 16, 8, 24, 8, 0, 8, V4L2_PIX_FMT_ARGB32 }, }; static bool match_bitfield(const struct fb_bitfield &bf, unsigned off, unsigned len) @@ -182,9 +182,7 @@ static int fbuf_fill_from_fb(struct v4l2_framebuffer &fb, const char *fb_device) if (vi.bits_per_pixel == 8) fb.fmt.pixelformat = V4L2_PIX_FMT_GREY; } else { - for (int i = 0; fb_formats[i].pixfmt; i++) { - const struct bitfield2fmt &p = fb_formats[i]; - + for (const auto &p : fb_formats) { if (match_bitfield(vi.blue, p.blue_off, p.blue_len) && match_bitfield(vi.green, p.green_off, p.green_len) && match_bitfield(vi.red, p.red_off, p.red_len) && From patchwork Wed Apr 21 07:20:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 425489 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 732D1C433ED for ; Wed, 21 Apr 2021 07:20:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 57B9E61432 for ; Wed, 21 Apr 2021 07:20:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236756AbhDUHVQ (ORCPT ); Wed, 21 Apr 2021 03:21:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236727AbhDUHVP (ORCPT ); Wed, 21 Apr 2021 03:21:15 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EEB2C06174A for ; Wed, 21 Apr 2021 00:20:42 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id v13so7532003ple.9 for ; Wed, 21 Apr 2021 00:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=L9QNhOfkitg4jDlWiEN6PC85EXYAfGnClF8IkWPpAEc=; b=JtO5Rjwa8cbD+86EiUiucsmouoE4e1h48R9l9krY0A0ccAJjlU8MQ6GwLuS5FXS5Rd 4/JW0/I7nbt2E49KJvTyYmqHHLATL4zEOxRPGIEXtXlGpr8f4BIWVHNr/7VNZGcRgeO0 ZcqGVbogkXLHMgbhm3IV6Q/QqtJcZfxhmdAADJ4U4kHtISIpTMigqSwFV1iZ0/a6z0/3 SAEbzbu9pa0WX+tPu8oGNVo3WC91FFtqnM/zeNOGhSmRuQOw9fCUjyylUShFiQjhLnyG p/G/bRA55gPC94AC7ig7ZAV6jSZjntJMxrjqCC1fa+cnFOHwlhsSCDOJ6tBt2LuhTYHw VsTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L9QNhOfkitg4jDlWiEN6PC85EXYAfGnClF8IkWPpAEc=; b=MscTFaQoH2BJa5igXd+FV4NDAL8sBkva8KmM1Ibd0g3K3Weu/dp0r5wPAkuDYBje0P dEOI8dS/EKyJbhmZPAaQPuS5D45Wg/asZgOitm7NF1D7ODsvGqyazd5jFElu60ry7tAb siOAL/ZARdbn7T1QMLKKwkFoo0/08kHtRs4reBOHej7dakkdU7qutd+03wGC40esh4/7 xxdcy2yDYa8Vp1dERFdrqTUpOmQ+iXCKIOjgzBaBJxS9cjOmI3GINW1aBIVYa/ySHGXk O8SWqXV8+JA5I0j/CmjW5+9ZXmYQ+oNjBh18cDx6jy5VWl/9oCFcfSeMuANtwVfTvKRS ntQQ== X-Gm-Message-State: AOAM532vMmacMxD6EEecECJhUsjcmAyQW0ZK5p2+nlh/a+WcE9rxCzZB vhDU642dWdBBNq7tZc4zKjMBnTS0v0q+pA== X-Google-Smtp-Source: ABdhPJwNVyEHbvFCHMgjGMgAlaUgy0mO4EgOWZBUy3Ku0Wub67Czc9o3Amjv0kkg9sOpI/mTmoKsAA== X-Received: by 2002:a17:902:6b81:b029:ea:dcc5:b841 with SMTP id p1-20020a1709026b81b02900eadcc5b841mr32379710plk.29.1618989641991; Wed, 21 Apr 2021 00:20:41 -0700 (PDT) Received: from mangix-trapnet.lan ([2001:470:1f05:79e::a89]) by smtp.gmail.com with ESMTPSA id p10sm907815pfo.210.2021.04.21.00.20.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 00:20:41 -0700 (PDT) From: Rosen Penev To: linux-media@vger.kernel.org Subject: [PATCH 7/8] v4l2-utils: turn mbus_names into const vector Date: Wed, 21 Apr 2021 00:20:34 -0700 Message-Id: <20210421072035.4188497-7-rosenp@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210421072035.4188497-1-rosenp@gmail.com> References: <20210421072035.4188497-1-rosenp@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Allows usage of a more standard for loop. Signed-off-by: Rosen Penev --- utils/v4l2-ctl/v4l2-ctl-subdev.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/v4l2-ctl/v4l2-ctl-subdev.cpp b/utils/v4l2-ctl/v4l2-ctl-subdev.cpp index d0f391bba..f2be9442c 100644 --- a/utils/v4l2-ctl/v4l2-ctl-subdev.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-subdev.cpp @@ -1,3 +1,5 @@ +#include + #include "v4l2-ctl.h" struct mbus_name { @@ -5,10 +7,9 @@ struct mbus_name { __u32 code; }; -static struct mbus_name mbus_names[] = { +static const std::vector mbus_names{ { "Fixed", MEDIA_BUS_FMT_FIXED }, #include "media-bus-format-names.h" - { nullptr, 0 } }; /* selection specified */ @@ -343,9 +344,9 @@ static void print_framefmt(const struct v4l2_mbus_framefmt &fmt) { __u32 colsp = fmt.colorspace; __u32 ycbcr_enc = fmt.ycbcr_enc; - unsigned int i; + size_t i; - for (i = 0; mbus_names[i].name; i++) + for (i = 0; i < mbus_names.size(); i++) if (mbus_names[i].code == fmt.code) break; printf("\tWidth/Height : %u/%u\n", fmt.width, fmt.height); @@ -554,9 +555,9 @@ void subdev_get(cv4l_fd &_fd) static void print_mbus_code(__u32 code) { - unsigned int i; + size_t i; - for (i = 0; mbus_names[i].name; i++) + for (i = 0; i < mbus_names.size(); i++) if (mbus_names[i].code == code) break; if (mbus_names[i].name) @@ -568,9 +569,8 @@ static void print_mbus_code(__u32 code) static void print_mbus_codes(int fd, __u32 pad) { - struct v4l2_subdev_mbus_code_enum mbus_code; + struct v4l2_subdev_mbus_code_enum mbus_code = {}; - memset(&mbus_code, 0, sizeof(mbus_code)); mbus_code.pad = pad; mbus_code.which = V4L2_SUBDEV_FORMAT_TRY;