From patchwork Wed May 30 07:16:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keiichi Watanabe X-Patchwork-Id: 10437751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C456C602BF for ; Wed, 30 May 2018 07:17:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFA1A28885 for ; Wed, 30 May 2018 07:17:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A39032888C; Wed, 30 May 2018 07:17:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 082A728885 for ; Wed, 30 May 2018 07:17:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933236AbeE3HR2 (ORCPT ); Wed, 30 May 2018 03:17:28 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:36238 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937148AbeE3HQo (ORCPT ); Wed, 30 May 2018 03:16:44 -0400 Received: by mail-pg0-f67.google.com with SMTP id m5-v6so3353848pgd.3 for ; Wed, 30 May 2018 00:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xosv+mRurXurIMKdWrIH5RGrOA3kjOyYvylS5BZoWeQ=; b=Adh5J3eKQI1irIaQ3qUsj8GsHwTHnJZXclassCB2lZWBdVzQT8Z2YNG0k32/oLTeWK BBRx8MZOtUNDpyUR5vLfD7RbDz61B2GnCTRcyHZnc6eS+8h/wI3UV6horrjXSkm1+RT/ oUbRdIvCtoGQW3y8sReVrpUBFC2xkqCCJyCcA= 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:in-reply-to :references; bh=Xosv+mRurXurIMKdWrIH5RGrOA3kjOyYvylS5BZoWeQ=; b=gXxrHUcsiPvmOMef++eLktr97KJ02Mce6bS7ruwLjRrBkrVc2NxqOOU7wX9bMGRpVB +qjgPRX7uplSYAa18NT94KcuJSELrMkkLVG1ZlJcCQbpoBV7c5skx4uB2XZpJmVdclCr Qo64c3nKQaTXuURzx+pp+0PM3GPm49qZ7Oo65kFNfV5J7PYAmgw+AeuR4tzqKWFAW/Nk tas+xPsUzsdLm5LIe2TLAYaVhepSkoRNlKnMEWr4bzlUldTw2FfLf68uf90FTjf/JsXQ ISax4MFt9NbolwUho4Iwkdrz1QvBbGNAruOUTDJEXhCUyzNvJprQ844mPTjwT/t5gcJP M7lA== X-Gm-Message-State: ALKqPwd7uLtpCk1B4rttIMPmZhDZGsDb3I/F23yMtQBpoF6v3d3NZQAM E5JDGbZ8OsYpXW0gxmKKEKwhjg== X-Google-Smtp-Source: ADUXVKJ/UIYP8SZZch4ZoUtqOqRBq9vvSviPgrFE3TxKBampqjhFWz8OxNhj4+fwUAcIOV0MkyJNvA== X-Received: by 2002:a65:56c1:: with SMTP id w1-v6mr1317343pgs.227.1527664604467; Wed, 30 May 2018 00:16:44 -0700 (PDT) Received: from keiichiw1.tok.corp.google.com ([2401:fa00:4:4:d188:dcc9:1684:2dfd]) by smtp.gmail.com with ESMTPSA id z129-v6sm54865651pfb.108.2018.05.30.00.16.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 00:16:43 -0700 (PDT) From: Keiichi Watanabe To: linux-arm-kernel@lists.infradead.org Cc: Mauro Carvalho Chehab , Tiffany Lin , Andrew-CT Chen , Matthias Brugger , Hans Verkuil , Sakari Ailus , Sylwester Nawrocki , Smitha T Murthy , Keiichi Watanabe , Tom Saeger , Andy Shevchenko , Tomasz Figa , Ricardo Ribalda Delgado , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH v2 1/2] media: v4l2-ctrl: Add control for VP9 profile Date: Wed, 30 May 2018 16:16:12 +0900 Message-Id: <20180530071613.125768-2-keiichiw@chromium.org> X-Mailer: git-send-email 2.17.0.921.gf22659ad46-goog In-Reply-To: <20180530071613.125768-1-keiichiw@chromium.org> References: <20180530071613.125768-1-keiichiw@chromium.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a new control V4L2_CID_MPEG_VIDEO_VP9_PROFILE for selecting desired profile for VP9 encoder and querying for supported profiles by VP9 encoder or decoder. An existing control V4L2_CID_MPEG_VIDEO_VPX_PROFILE cannot be used for querying since it is not a menu control but an integer control, which cannot return an arbitrary set of supported profiles. The new control V4L2_CID_MPEG_VIDEO_VP9_PROFILE is a menu control as with controls for other codec profiles. (e.g. H264) Signed-off-by: Keiichi Watanabe --- .../media/uapi/v4l/extended-controls.rst | 26 +++++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 12 +++++++++ include/uapi/linux/v4l2-controls.h | 8 ++++++ 3 files changed, 46 insertions(+) -- 2.17.0.921.gf22659ad46-goog diff --git a/Documentation/media/uapi/v4l/extended-controls.rst b/Documentation/media/uapi/v4l/extended-controls.rst index 03931f9b1285..4f7f128a4998 100644 --- a/Documentation/media/uapi/v4l/extended-controls.rst +++ b/Documentation/media/uapi/v4l/extended-controls.rst @@ -1959,6 +1959,32 @@ enum v4l2_vp8_golden_frame_sel - Select the desired profile for VPx encoder. Acceptable values are 0, 1, 2 and 3 corresponding to encoder profiles 0, 1, 2 and 3. +.. _v4l2-mpeg-video-vp9-profile: + +``V4L2_CID_MPEG_VIDEO_VP9_PROFILE`` + (enum) + +enum v4l2_mpeg_video_vp9_profile - + This control allows to select the profile for VP9 encoder. + This is also used to enumerate supported profiles by VP9 encoder or decoder. + Possible values are: + + + +.. flat-table:: + :header-rows: 0 + :stub-columns: 0 + + * - ``V4L2_MPEG_VIDEO_VP9_PROFILE_0`` + - Profile 0 + * - ``V4L2_MPEG_VIDEO_VP9_PROFILE_1`` + - Profile 1 + * - ``V4L2_MPEG_VIDEO_VP9_PROFILE_2`` + - Profile 2 + * - ``V4L2_MPEG_VIDEO_VP9_PROFILE_3`` + - Profile 3 + + 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 d29e45516eb7..401ce21c2e63 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -431,6 +431,13 @@ const char * const *v4l2_ctrl_get_menu(u32 id) "Use Previous Specific Frame", NULL, }; + static const char * const vp9_profile[] = { + "0", + "1", + "2", + "3", + NULL, + }; static const char * const flash_led_mode[] = { "Off", @@ -614,6 +621,8 @@ const char * const *v4l2_ctrl_get_menu(u32 id) return mpeg4_profile; case V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL: return vpx_golden_frame_sel; + case V4L2_CID_MPEG_VIDEO_VP9_PROFILE: + return vp9_profile; case V4L2_CID_JPEG_CHROMA_SUBSAMPLING: return jpeg_chroma_subsampling; case V4L2_CID_DV_TX_MODE: @@ -841,6 +850,8 @@ 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_VPX_PROFILE: return "VPX Profile"; + case V4L2_CID_MPEG_VIDEO_VP9_PROFILE: return "VP9 Profile"; + /* HEVC controls */ case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP: return "HEVC I-Frame QP Value"; case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP: return "HEVC P-Frame QP Value"; @@ -1180,6 +1191,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_DEINTERLACING_MODE: case V4L2_CID_TUNE_DEEMPHASIS: case V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL: + case V4L2_CID_MPEG_VIDEO_VP9_PROFILE: 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 8d473c979b61..56203b7b715c 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -589,6 +589,14 @@ enum v4l2_vp8_golden_frame_sel { #define V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP (V4L2_CID_MPEG_BASE+510) #define V4L2_CID_MPEG_VIDEO_VPX_PROFILE (V4L2_CID_MPEG_BASE+511) +#define V4L2_CID_MPEG_VIDEO_VP9_PROFILE (V4L2_CID_MPEG_BASE+512) +enum v4l2_mpeg_video_vp9_profile { + V4L2_MPEG_VIDEO_VP9_PROFILE_0 = 0, + V4L2_MPEG_VIDEO_VP9_PROFILE_1 = 1, + V4L2_MPEG_VIDEO_VP9_PROFILE_2 = 2, + V4L2_MPEG_VIDEO_VP9_PROFILE_3 = 3, +}; + /* CIDs for HEVC encoding. */ #define V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP (V4L2_CID_MPEG_BASE + 600)