From patchwork Mon Jul 13 08:15:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 235366 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2626436ilg; Mon, 13 Jul 2020 01:15:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylIAM+ZDfkd7s1G2X21vHff65ONG36664KQWJAjnhn1a0VuS7vQCND3L+5ip6AGJN4sNbr X-Received: by 2002:a17:906:c285:: with SMTP id r5mr70999020ejz.153.1594628121019; Mon, 13 Jul 2020 01:15:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594628121; cv=none; d=google.com; s=arc-20160816; b=c9bL6DLNJ9o4uaDrWisr75VcAP41OSOIYjo759Cy4FF0CpCmcPmETPy/dWFevWjxUu MAX/WVzCxvPxP3EmydgEgrZGSDb5jGeilS2AexiEWaTzXljyo2log43g63rYJCt9BaWj sfhG7LPJreQi+skO+YBIvyjakMT+zDIlhyxwCl+tlxrmu3BaKnNWiTLaKuU4dlRyiUf4 ejLa3CHaloWs7KnWv42V9ecbXJSrkUNtCWYTyVdqPdI88Xewdga+KPCuqOh65vP1k4Fp kk2w0Ez5yU6eBAPfMI9gtHpHMD70tZ3U46CoOoPMfTqi2Mft4qfM/LsgzVQR20pyybJu YSLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=QmsCPrjsmF9ge6HxrBzs06s6K7Fzeye/XmayjmsFHts=; b=K0b1tZRGx2S2nwGLjmgjwPJZCtXDmT+Hwb1kcFIxfEXpmw0RCljAyXLJya7siXVNA9 cEXeHmsW2L9keMPFCLrvwkRZX+9fkDFTxIo5ikN1g9xeRULDW5ZHC4R5my2PPOFXT1Vc YxFdzlmtmMXU7wjJt1qdw+Y9ZMViCibCD3MfCqLY3MjNQ+gENDDWvvcebRo2KvGIMkAW aHh8Iz1lgd6STFmKuWXpdrvHq4bcvF/W0FHQpuZBT16U/fbj/pWVu77C60BpLhkOQu/5 nwd8QFsLgh5WAoEwg6l3rSV9O12LMFo446TL96AU3q2MXMAfkfga4zfZnfW9HuwvXG7M v9eQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o4W3X0HW; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-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 l12si9764299edk.328.2020.07.13.01.15.20; Mon, 13 Jul 2020 01:15:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-media-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=o4W3X0HW; spf=pass (google.com: domain of linux-media-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-media-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 S1729027AbgGMIPT (ORCPT + 4 others); Mon, 13 Jul 2020 04:15:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728833AbgGMIPQ (ORCPT ); Mon, 13 Jul 2020 04:15:16 -0400 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 307EFC061794 for ; Mon, 13 Jul 2020 01:15:16 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id br7so1632316ejb.5 for ; Mon, 13 Jul 2020 01:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=QmsCPrjsmF9ge6HxrBzs06s6K7Fzeye/XmayjmsFHts=; b=o4W3X0HWod6I8G+MqrbvI720nnYRbPalw90Q4ujasVKbLO0fEGRyAnhUNWCXWL1/9+ fWYzZvnX5BrfksAvL/o4bBt9ykx/q3H3vXjURDZAV8WznnRMZf8FqV9Lty912PKBoOLi zEoy8osXqbQ3vFRlsrsy554DJlX/tl7W9gLMRkjjccOH1o5Xhhgi9J4fYbVGvi77a8s0 uupbghw2wCl0NCGmPMonPtalDsyn2DhFbd/Z1nVssYQcLbLL8oWWDYFXy/Ga4TpyeXVP Zxwuw29DcQYUgYtdmMhtDEIRVyjMHBqgTdvaLYeP/jVG9wvnErzgFg2qGZI0Ve077/8b bC5w== 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; bh=QmsCPrjsmF9ge6HxrBzs06s6K7Fzeye/XmayjmsFHts=; b=o2aGi8JDdMYLwUijeRW5cb6sHgiYTTCsTXAJTykZrJpWbgnItuh5h/6PlaTkGoWKbZ TyltaVP2hUi9SUF1f2mo4qwiwTq0DfALXYxuKViIub8wnC3rV1AaMnhky/MD/6wpaa/B LPAcoUaJexlPkLfqb0WfHwTnqlafm3nplrGY3ssPlnCK5xvPapQIyEZ433d/ydS0WC96 zEpj7w8eCGSahGFTvHeyt6OSbOWj9XLiVA3xPpjGAZTzdhikobbAHkb5zUc4m+6EeLOp Me0+8GgBp7x76ZT6281iHUtFPbIvvZjzmMamxJd484NQok5bumjuoWTfO4YI0mqlZ6A+ LWzw== X-Gm-Message-State: AOAM530LQI/HUMG4+CZ0rbOjIfkweCX0pid3E0JmEMecLvmJbUw9l6vX efHoMa+PMR8QGYiuvJlSjnPLuIyt1U0ZUA== X-Received: by 2002:a17:906:2799:: with SMTP id j25mr58883707ejc.466.1594628114456; Mon, 13 Jul 2020 01:15:14 -0700 (PDT) Received: from localhost.localdomain (212-5-158-188.ip.btc-net.bg. [212.5.158.188]) by smtp.gmail.com with ESMTPSA id q3sm10721085eds.41.2020.07.13.01.15.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 01:15:13 -0700 (PDT) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Stanimir Varbanov Subject: [PATCH] v4l2-ctrl: Add VP9 codec levels Date: Mon, 13 Jul 2020 11:15:01 +0300 Message-Id: <20200713081501.28609-1-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add menu control for VP9 codec levels. A total of 14 levels are defined for Profile 0 (8bit) and Profile 2 (10bit). Each level is a set of constrained bitstreams coded with targeted resolutions, frame rates, and bitrates. The definition has been taken from webm project. Signed-off-by: Stanimir Varbanov --- .../media/v4l/ext-ctrls-codec.rst | 42 +++++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 21 ++++++++++ include/uapi/linux/v4l2-controls.h | 17 ++++++++ 3 files changed, 80 insertions(+) -- 2.17.1 diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst index d0d506a444b1..d49bdafa768a 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst @@ -3316,6 +3316,48 @@ enum v4l2_mpeg_video_vp9_profile - * - ``V4L2_MPEG_VIDEO_VP9_PROFILE_3`` - Profile 3 +.. _v4l2-mpeg-video-vp9-level: + +``V4L2_CID_MPEG_VIDEO_VP9_LEVEL (enum)`` + +enum v4l2_mpeg_video_vp9_level - + This control allows selecting the level for VP9 encoder. + This is also used to enumerate supported levels by VP9 encoder or decoder. + Possible values are: + +.. flat-table:: + :header-rows: 0 + :stub-columns: 0 + + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_1_0`` + - Level 1 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_1_1`` + - Level 1.1 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_2_0`` + - Level 2 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_2_1`` + - Level 2.1 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_3_0`` + - Level 3 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_3_1`` + - Level 3.1 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_4_0`` + - Level 4 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_4_1`` + - Level 4.1 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_5_0`` + - Level 5 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_5_1`` + - Level 5.1 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_5_2`` + - Level 5.2 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_6_0`` + - Level 6 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_6_1`` + - Level 6.1 + * - ``V4L2_MPEG_VIDEO_VP9_LEVEL_6_2`` + - Level 6.2 + High Efficiency Video Coding (HEVC/H.265) Control Reference =========================================================== diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 3f3fbcd60cc6..359dc737053d 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -474,6 +474,23 @@ const char * const *v4l2_ctrl_get_menu(u32 id) "3", NULL, }; + static const char * const vp9_level[] = { + "1", + "1.1", + "2", + "2.1", + "3", + "3.1", + "4", + "4.1", + "5", + "5.1", + "5.2", + "6", + "6.1", + "6.2", + NULL, + }; static const char * const flash_led_mode[] = { "Off", @@ -685,6 +702,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id) return vp8_profile; case V4L2_CID_MPEG_VIDEO_VP9_PROFILE: return vp9_profile; + case V4L2_CID_MPEG_VIDEO_VP9_LEVEL: + return vp9_level; case V4L2_CID_JPEG_CHROMA_SUBSAMPLING: return jpeg_chroma_subsampling; case V4L2_CID_DV_TX_MODE: @@ -938,6 +957,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP: return "VPX P-Frame QP Value"; case V4L2_CID_MPEG_VIDEO_VP8_PROFILE: return "VP8 Profile"; case V4L2_CID_MPEG_VIDEO_VP9_PROFILE: return "VP9 Profile"; + case V4L2_CID_MPEG_VIDEO_VP9_LEVEL: return "VP9 Level"; case V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER: return "VP8 Frame Header"; /* HEVC controls */ @@ -1294,6 +1314,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL: case V4L2_CID_MPEG_VIDEO_VP8_PROFILE: case V4L2_CID_MPEG_VIDEO_VP9_PROFILE: + case V4L2_CID_MPEG_VIDEO_VP9_LEVEL: case V4L2_CID_DETECT_MD_MODE: case V4L2_CID_MPEG_VIDEO_HEVC_PROFILE: case V4L2_CID_MPEG_VIDEO_HEVC_LEVEL: diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 62271418c1be..1b0bc79c1bc3 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -650,6 +650,23 @@ enum v4l2_mpeg_video_vp9_profile { V4L2_MPEG_VIDEO_VP9_PROFILE_2 = 2, V4L2_MPEG_VIDEO_VP9_PROFILE_3 = 3, }; +#define V4L2_CID_MPEG_VIDEO_VP9_LEVEL (V4L2_CID_MPEG_BASE+513) +enum v4l2_mpeg_video_vp9_level { + V4L2_MPEG_VIDEO_VP9_LEVEL_1_0 = 0, + V4L2_MPEG_VIDEO_VP9_LEVEL_1_1 = 1, + V4L2_MPEG_VIDEO_VP9_LEVEL_2_0 = 2, + V4L2_MPEG_VIDEO_VP9_LEVEL_2_1 = 3, + V4L2_MPEG_VIDEO_VP9_LEVEL_3_0 = 4, + V4L2_MPEG_VIDEO_VP9_LEVEL_3_1 = 5, + V4L2_MPEG_VIDEO_VP9_LEVEL_4_0 = 6, + V4L2_MPEG_VIDEO_VP9_LEVEL_4_1 = 7, + V4L2_MPEG_VIDEO_VP9_LEVEL_5_0 = 8, + V4L2_MPEG_VIDEO_VP9_LEVEL_5_1 = 9, + V4L2_MPEG_VIDEO_VP9_LEVEL_5_2 = 10, + V4L2_MPEG_VIDEO_VP9_LEVEL_6_0 = 11, + V4L2_MPEG_VIDEO_VP9_LEVEL_6_1 = 12, + V4L2_MPEG_VIDEO_VP9_LEVEL_6_2 = 13, +}; /* CIDs for HEVC encoding. */