Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp982277pxb; Wed, 3 Mar 2021 23:25:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSao1Rs5QVX/1IrTMA2jdt7AAZeGmsVWJQ/J1Qw3gtgZn3BqjhXrn0j3oOez6O+U2yFok1 X-Received: by 2002:a17:906:12d2:: with SMTP id l18mr2691426ejb.308.1614842732406; Wed, 03 Mar 2021 23:25:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614842732; cv=none; d=google.com; s=arc-20160816; b=e5FQ1wIFGR2ojInC+Ki9LKr6ZdWYEw9nmtCHQA9dacVaXg8lWHcbM0LofUlRAWPb0N BnCGlWrksyFMe368RtDfdPgV7xGtsujJEqhknQvzBGdfi3SYg1FGCC6VUp53y8YNhDRf M2V8nz2qjY8lI9/Sy2P0J3cykh5CKWaZ0DFY3xr6fJe9js38Wo/W33lHS8eTC4rPW8DA 4hBtNjLXZp1TlX8eiPSM/dCjU5NiYBIXA8qw0uY1gXwySdqZcXFeGm7eBM0jY5XgK2l2 Vlch3hDL2SzmLVNClx8SOZ8op9qXi7TxCXsntIf2lJNym+OSBofJQZnNhI+XoIwHGfL5 maaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=F18VD5O5Vmw7rHVUpp3r00XyGd8mL7zbOwbSF/kiUSQ=; b=WjExjKggJqL3+T2tpD9Mke8clImKtrI/1rvvY8yKuUQKs0SuCmmJYrM+8CQ8rlQpIa 7fPHCrqtc0Qhi+x7p3Jq+KlaEAgb1heIEumsyGLKcraHPuxU0g57ktNvfAv6y7KI4+cX FwJhoajbVi+RcVITHnCuZ+P1ZmS4duSE69Z0qZxRopf2pwLFiYg9p7oPXWum66OfbDp6 Q9wUuivt341mXLAueaM+c98sRskJGFCjM5Uu1BZ2LDYmRTtBnZwFmYwNYdZ9kdQi0veE ZTHi4aUkOATXZFIY5YP2z8Rvqqs+rYKzBNK4pWc03c4R4+Rv3cbzY5zVuvSHJm0cz0yc 3YKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pbdTFhYe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jg13si17579797ejc.210.2021.03.03.23.25.06; Wed, 03 Mar 2021 23:25:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pbdTFhYe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2360954AbhCBXIW (ORCPT + 99 others); Tue, 2 Mar 2021 18:08:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1574619AbhCBWnB (ORCPT ); Tue, 2 Mar 2021 17:43:01 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51C6CC061788 for ; Tue, 2 Mar 2021 14:42:21 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id e10so21320041wro.12 for ; Tue, 02 Mar 2021 14:42:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=F18VD5O5Vmw7rHVUpp3r00XyGd8mL7zbOwbSF/kiUSQ=; b=pbdTFhYecfJuXRHGNDLsEgpVPh9CFIXOOUQ9v4CXNd862P0YB3FVMTf/F4GjSp73Yp ePFVlZ1JUlYQQ/yIyIGoAd5mgvA2dLL2eGJvCQw7cfB2vJXG3/3C6s9LWYjENV4HNo4S aZ9nE7eQOsqRTyO9Bd+u/CAD1uG9Mas75VJYG/ydAuuRFNhxU5XMCsy3+9T/CS5t5pGh ZPiHlz8b6EXOMkFaTou9Tp/JUVx3QTeuiTf7PQoQ3vOuikC7DYwItF3UC4IOHr7nLZme YEU5Zn3eeXF0Se/oumdzF/5gXWN+MyJ4FopOLECMUIVd6EUEVKxCrMafbTk/n13C2ahJ tkwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=F18VD5O5Vmw7rHVUpp3r00XyGd8mL7zbOwbSF/kiUSQ=; b=aQtCqVRlcc94nB0VU92OsRr0T+5dyUp0sumjWtHKBJrc2dekFThaHaIwyai2lYTv1Z cmc0GApd2hlihCWg9i/TUd5h5Y0voq1CPtzyC0RZg9r9tXJ6PXcTgYbFPEVdGMBlBAc+ b2jlL/rohYiCjnv/PgLZRIso28I6Cc2EWQDMLBKt+4IfAnDGwr9hmPXRngzjUmS8xs9B SBIi3rge1wETZ4BBH/5TrsXa0TpCPj3c4AgbeYawFD/GbOqAN78ft4T3ZfbsL1B/TRVn 7GSbKz+wFIpq/28LiXVxAsUzyGiDDuuDDHue5qkxTIMACXKPIm8p5xElVbLzsT9ggzcM RFvQ== X-Gm-Message-State: AOAM530foM3Q3qsVYCHlSx5wUaTtKy/FNqYF3n1+SheLFtVMnmSI/FCR lNPa+/ZSkqsPGQs03H+0tMM/Vw== X-Received: by 2002:a5d:6b82:: with SMTP id n2mr23598514wrx.78.1614724940098; Tue, 02 Mar 2021 14:42:20 -0800 (PST) Received: from localhost.localdomain (hst-221-2.medicom.bg. [84.238.221.2]) by smtp.gmail.com with ESMTPSA id m9sm15543686wro.52.2021.03.02.14.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 14:42:19 -0800 (PST) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mauro Carvalho Chehab , Hans Verkuil , Ezequiel Garcia , Stanimir Varbanov Subject: [PATCH] v4l2-ctrls: Fix h264 hierarchical coding type menu ctrl Date: Wed, 3 Mar 2021 00:42:06 +0200 Message-Id: <20210302224206.3680649-1-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a name of the menu and fill control type. Signed-off-by: Stanimir Varbanov --- drivers/media/v4l2-core/v4l2-ctrls.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 016cf6204cbb..5d99e2294335 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -421,6 +421,11 @@ const char * const *v4l2_ctrl_get_menu(u32 id) "Annex B Start Code", NULL, }; + static const char * const h264_hierarchical_coding_type[] = { + "Hier Coding B", + "Hier Coding P", + NULL, + }; static const char * const mpeg_mpeg2_level[] = { "Low", "Main", @@ -697,6 +702,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id) return h264_decode_mode; case V4L2_CID_STATELESS_H264_START_CODE: return h264_start_code; + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE: + return h264_hierarchical_coding_type; case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL: return mpeg_mpeg2_level; case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE: @@ -1326,6 +1333,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC: case V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE: case V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE: + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE: case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL: case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE: case V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL: -- 2.25.1