From: Smitha T Murthy <smitha.t@samsung.com>
To: linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org
Cc: m.szyprowski@samsung.com, andrzej.hajda@intel.com,
mchehab@kernel.org, hverkuil-cisco@xs4all.nl,
ezequiel@vanguardiasur.com.ar, jernej.skrabec@gmail.com,
benjamin.gaignard@collabora.com, stanimir.varbanov@linaro.org,
dillon.minfei@gmail.com, david.plowman@raspberrypi.com,
mark.rutland@arm.com, robh+dt@kernel.org, krzk+dt@kernel.org,
andi@etezian.org, alim.akhtar@samsung.com,
aswani.reddy@samsung.com, pankaj.dubey@samsung.com,
Smitha T Murthy <smitha.t@samsung.com>,
linux-fsd@tesla.com
Subject: [PATCH 07/20] media: v4l2: Add v4l2 control IDs for VP9 encoder.
Date: Tue, 17 May 2022 18:25:35 +0530 [thread overview]
Message-ID: <20220517125548.14746-8-smitha.t@samsung.com> (raw)
In-Reply-To: <20220517125548.14746-1-smitha.t@samsung.com>
Add V4l2 controls for VP9 encoder
Cc: linux-fsd@tesla.com
Signed-off-by: Smitha T Murthy <smitha.t@samsung.com>
---
drivers/media/v4l2-core/v4l2-ctrls-defs.c | 44 +++++++++++++++++++++++
include/uapi/linux/v4l2-controls.h | 33 +++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
index 54ca4e6b820b..f251d63e333c 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
@@ -572,6 +572,21 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
"VBV/CPB Limit",
NULL,
};
+ static const char * const vp9_golden_framesel[] = {
+ "Use previous",
+ "Use refresh period",
+ NULL,
+ };
+ static const char * const vp9_ref_num_for_pframes[] = {
+ "1",
+ "2",
+ NULL,
+ };
+ static const char * const vp9_max_partition_depth[] = {
+ "No CU partition depth",
+ "Allow 1 CU partition depth",
+ NULL,
+ };
switch (id) {
case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:
@@ -703,6 +718,12 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
return hevc_decode_mode;
case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE:
return hevc_start_code;
+ case V4L2_CID_MPEG_VIDEO_VP9_GOLDEN_FRAMESEL:
+ return vp9_golden_framesel;
+ case V4L2_CID_MPEG_VIDEO_VP9_REF_NUMBER_FOR_PFRAMES:
+ return vp9_ref_num_for_pframes;
+ case V4L2_CID_MPEG_VIDEO_VP9_MAX_PARTITION_DEPTH:
+ return vp9_max_partition_depth;
case V4L2_CID_CAMERA_ORIENTATION:
return camera_orientation;
default:
@@ -942,6 +963,26 @@ const char *v4l2_ctrl_get_name(u32 id)
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_VP9_I_FRAME_QP: return "VP9 I Frame QP Value";
+ case V4L2_CID_MPEG_VIDEO_VP9_P_FRAME_QP: return "VP9 P Frame QP Value";
+ case V4L2_CID_MPEG_VIDEO_VP9_MAX_QP: return "VP9 Frame QP MAX Value";
+ case V4L2_CID_MPEG_VIDEO_VP9_MIN_QP: return "VP9 Frame QP MIN Value";
+ case V4L2_CID_MPEG_VIDEO_VP9_RC_FRAME_RATE: return "VP9 Frame Rate";
+ case V4L2_CID_MPEG_VIDEO_VP9_GOLDEN_FRAMESEL: return "VP9 Indication of Golden Frame";
+ case V4L2_CID_MPEG_VIDEO_VP9_GF_REFRESH_PERIOD: return "VP9 Golden Frame Refresh Period";
+ case V4L2_CID_MPEG_VIDEO_VP9_HIERARCHY_QP_ENABLE: return "VP9 Hierarchical QP Enable";
+ case V4L2_CID_MPEG_VIDEO_VP9_REF_NUMBER_FOR_PFRAMES: return "VP9 Number of Reference Pictures";
+ case V4L2_CID_MPEG_VIDEO_VP9_HIERARCHICAL_CODING_LAYER: return "VP9 Num of Hierarchical Layers";
+ case V4L2_CID_MPEG_VIDEO_VP9_MAX_PARTITION_DEPTH: return "VP9 Maximum Coding Unit Depth";
+ case V4L2_CID_MPEG_VIDEO_VP9_DISABLE_INTRA_PU_SPLIT: return "VP9 Disable Intra PU Split";
+ case V4L2_CID_MPEG_VIDEO_VP9_HIERARCHY_RC_ENABLE: return "VP9 Hierarchical BitRate Enable";
+ case V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L0_BR: return "VP9 Hierarchical Layer 0 BitRate";
+ case V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L1_BR: return "VP9 Hierarchical Layer 1 BitRate";
+ case V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L2_BR: return "VP9 Hierarchical Layer 2 BitRate";
+ case V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L0_QP: return "VP9 Layer0 QP Value";
+ case V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L1_QP: return "VP9 Layer1 QP Value";
+ case V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L2_QP: return "VP9 Layer2 QP Value";
+ case V4L2_CID_MPEG_VIDEO_VP9_DISABLE_IVF_HEADER: return "VP9 IVF header generation";
/* HEVC controls */
case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP: return "HEVC I-Frame QP Value";
@@ -1357,6 +1398,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
case V4L2_CID_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE:
case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE:
case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE:
+ case V4L2_CID_MPEG_VIDEO_VP9_GOLDEN_FRAMESEL:
+ case V4L2_CID_MPEG_VIDEO_VP9_REF_NUMBER_FOR_PFRAMES:
+ case V4L2_CID_MPEG_VIDEO_VP9_MAX_PARTITION_DEPTH:
case V4L2_CID_STATELESS_H264_DECODE_MODE:
case V4L2_CID_STATELESS_H264_START_CODE:
case V4L2_CID_CAMERA_ORIENTATION:
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index bb40129446d4..6dd82b738ef5 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -711,6 +711,38 @@ enum v4l2_mpeg_video_vp9_level {
V4L2_MPEG_VIDEO_VP9_LEVEL_6_1 = 12,
V4L2_MPEG_VIDEO_VP9_LEVEL_6_2 = 13,
};
+#define V4L2_CID_MPEG_VIDEO_VP9_RC_FRAME_RATE (V4L2_CID_CODEC_BASE+514)
+#define V4L2_CID_MPEG_VIDEO_VP9_MIN_QP (V4L2_CID_CODEC_BASE+515)
+#define V4L2_CID_MPEG_VIDEO_VP9_MAX_QP (V4L2_CID_CODEC_BASE+516)
+#define V4L2_CID_MPEG_VIDEO_VP9_I_FRAME_QP (V4L2_CID_CODEC_BASE+517)
+#define V4L2_CID_MPEG_VIDEO_VP9_P_FRAME_QP (V4L2_CID_CODEC_BASE+518)
+#define V4L2_CID_MPEG_VIDEO_VP9_GOLDEN_FRAMESEL (V4L2_CID_CODEC_BASE+519)
+enum v4l2_mpeg_vp9_golden_framesel {
+ V4L2_CID_MPEG_VIDEO_VP9_GOLDEN_FRAME_USE_PREV = 0,
+ V4L2_CID_MPEG_VIDEO_VP9_GOLDEN_FRAME_USE_REF_PERIOD = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_VP9_GF_REFRESH_PERIOD (V4L2_CID_CODEC_BASE+520)
+#define V4L2_CID_MPEG_VIDEO_VP9_HIERARCHY_QP_ENABLE (V4L2_CID_CODEC_BASE+521)
+#define V4L2_CID_MPEG_VIDEO_VP9_REF_NUMBER_FOR_PFRAMES (V4L2_CID_CODEC_BASE+522)
+enum v4l2_mpeg_vp9_ref_num_for_pframes {
+ V4L2_CID_MPEG_VIDEO_VP9_1_REF_PFRAME = 0,
+ V4L2_CID_MPEG_VIDEO_VP9_2_REF_PFRAME = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_VP9_HIERARCHICAL_CODING_LAYER (V4L2_CID_CODEC_BASE+523)
+#define V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L0_BR (V4L2_CID_CODEC_BASE+524)
+#define V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L1_BR (V4L2_CID_CODEC_BASE+525)
+#define V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L2_BR (V4L2_CID_CODEC_BASE+526)
+#define V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L0_QP (V4L2_CID_CODEC_BASE+527)
+#define V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L1_QP (V4L2_CID_CODEC_BASE+528)
+#define V4L2_CID_MPEG_VIDEO_VP9_HIER_CODING_L2_QP (V4L2_CID_CODEC_BASE+529)
+#define V4L2_CID_MPEG_VIDEO_VP9_MAX_PARTITION_DEPTH (V4L2_CID_CODEC_BASE+530)
+enum v4l2_mpeg_vp9_num_partitions {
+ V4L2_CID_MPEG_VIDEO_VP9_0_PARTITION = 0,
+ V4L2_CID_MPEG_VIDEO_VP9_1_PARTITION = 1,
+};
+#define V4L2_CID_MPEG_VIDEO_VP9_DISABLE_INTRA_PU_SPLIT (V4L2_CID_CODEC_BASE+531)
+#define V4L2_CID_MPEG_VIDEO_VP9_DISABLE_IVF_HEADER (V4L2_CID_CODEC_BASE+532)
+#define V4L2_CID_MPEG_VIDEO_VP9_HIERARCHY_RC_ENABLE (V4L2_CID_CODEC_BASE+533)
/* CIDs for HEVC encoding. */
@@ -821,6 +853,7 @@ enum v4l2_mpeg_video_frame_skip_mode {
#define V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY (V4L2_CID_CODEC_BASE + 653)
#define V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE (V4L2_CID_CODEC_BASE + 654)
+
/* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
#define V4L2_CID_CODEC_CX2341X_BASE (V4L2_CTRL_CLASS_CODEC | 0x1000)
#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_CODEC_CX2341X_BASE+0)
--
2.17.1
next prev parent reply other threads:[~2022-05-17 12:59 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20220517125511epcas5p4e9a4e3c327771dd1faf0a50057a2c17b@epcas5p4.samsung.com>
2022-05-17 12:55 ` [PATCH 00/20] Add MFC v12 support Smitha T Murthy
2022-05-17 12:55 ` [PATCH 01/20] MAINTAINERS: Add git repo path for MFC Smitha T Murthy
2022-05-17 13:35 ` Krzysztof Kozlowski
2022-05-17 12:55 ` [PATCH 02/20] dt-bindings: media: s5p-mfc: Convert s5p-mfc.txt to new DT schema Smitha T Murthy
2022-05-17 13:55 ` Krzysztof Kozlowski
2022-07-05 11:44 ` Smitha T Murthy
2022-07-05 12:08 ` Krzysztof Kozlowski
2022-05-17 20:19 ` Rob Herring
2022-05-17 12:55 ` [PATCH 03/20] dt-bindings: media: s5p-mfc: Add mfcv12 variant Smitha T Murthy
2022-05-17 13:58 ` Krzysztof Kozlowski
2022-07-05 11:46 ` Smitha T Murthy
2022-05-17 12:55 ` [PATCH 04/20] media: s5p-mfc: Rename IS_MFCV10 macro Smitha T Murthy
2022-05-18 8:41 ` Andrzej Hajda
2022-05-19 6:46 ` Andrzej Hajda
2022-05-17 12:55 ` [PATCH 05/20] media: s5p-mfc: Add initial support for MFCv12 Smitha T Murthy
2022-05-18 11:38 ` Andrzej Hajda
2022-05-17 12:55 ` [PATCH 06/20] Documention: v4l: Documentation for VP9 CIDs Smitha T Murthy
2022-05-17 13:13 ` Nicolas Dufresne
2022-07-05 11:26 ` Smitha T Murthy
2022-05-18 9:45 ` Hans Verkuil
2022-05-17 12:55 ` Smitha T Murthy [this message]
2022-05-17 12:55 ` [PATCH 08/20] media: s5p-mfc: Add support for VP9 encoder Smitha T Murthy
2022-05-17 12:55 ` [PATCH 09/20] media: s5p-mfc: Add YV12 and I420 multiplanar format support Smitha T Murthy
2022-05-17 12:55 ` [PATCH 10/20] media: s5p-mfc: Add support for rate controls in MFCv12 Smitha T Murthy
2022-05-17 12:55 ` [PATCH 11/20] media: s5p-mfc: Add support for UHD encoding Smitha T Murthy
2022-05-18 9:50 ` Hans Verkuil
2022-05-17 12:55 ` [PATCH 12/20] media: s5p-mfc: Add support for DMABUF for encoder Smitha T Murthy
2022-05-17 12:55 ` [PATCH 13/20] media: s5p-mfc: Set context for valid case before calling try_run Smitha T Murthy
2022-05-17 12:55 ` [PATCH 14/20] media: s5p-mfc: Load firmware for each run in MFCv12 Smitha T Murthy
2022-05-17 12:55 ` [PATCH 15/20] media: s5p-mfc: DPB Count Independent of VIDIOC_REQBUF Smitha T Murthy
2022-05-17 13:59 ` Krzysztof Kozlowski
2022-07-05 11:47 ` Smitha T Murthy
2022-05-17 12:55 ` [PATCH 16/20] media: s5p-mfc: Fix to handle reference queue during finishing Smitha T Murthy
2022-05-17 14:04 ` Krzysztof Kozlowski
2022-05-17 12:55 ` [PATCH 17/20] media: s5p-mfc: Clear workbit to handle error condition Smitha T Murthy
2022-05-17 14:04 ` Krzysztof Kozlowski
2022-07-05 11:52 ` Smitha T Murthy
2022-05-17 12:55 ` [PATCH 18/20] media: s5p-mfc: Correction in register read and write for H264 Smitha T Murthy
2022-05-17 14:04 ` Krzysztof Kozlowski
2022-07-05 11:50 ` Smitha T Murthy
2022-05-17 12:55 ` [PATCH 19/20] arm64: dts: fsd: Add MFC related DT enteries Smitha T Murthy
2022-05-17 14:02 ` Krzysztof Kozlowski
2022-07-05 11:49 ` Smitha T Murthy
2022-05-17 12:55 ` [PATCH 20/20] arm64 defconfig: Add MFC in defconfig Smitha T Murthy
2022-05-17 14:03 ` Krzysztof Kozlowski
2022-05-18 9:42 ` [PATCH 00/20] Add MFC v12 support Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220517125548.14746-8-smitha.t@samsung.com \
--to=smitha.t@samsung.com \
--cc=alim.akhtar@samsung.com \
--cc=andi@etezian.org \
--cc=andrzej.hajda@intel.com \
--cc=aswani.reddy@samsung.com \
--cc=benjamin.gaignard@collabora.com \
--cc=david.plowman@raspberrypi.com \
--cc=devicetree@vger.kernel.org \
--cc=dillon.minfei@gmail.com \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsd@tesla.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mark.rutland@arm.com \
--cc=mchehab@kernel.org \
--cc=pankaj.dubey@samsung.com \
--cc=robh+dt@kernel.org \
--cc=stanimir.varbanov@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox