Add new controls for QP and layer bitrate
Subsystems (4)
v4 cover Add new controls for QP and layer bitrate
This series adds frame specific min/max qp controls for hevc and layer wise bitrate control for h264.
Chnages since v2:
- Rebased the changes on latest media tree
- Added driver side implementation for new controls.
Dikshita Agarwal (3):
media: v4l2-ctrl: Add frame-specific min/max qp controls for hevc
media: v4l2-ctrl: Add layer wise bitrate controls for h264
venus: venc: Add support for frame-specific min/max qp controls
.../userspace-api/media/v4l/ext-ctrls-codec.rst | 72 ++++++++++++- drivers/media/platform/qcom/venus/core.h | 18 ++++ drivers/media/platform/qcom/venus/venc.c | 21 +++- drivers/media/platform/qcom/venus/venc_ctrls.c | 114 +++++++++++++++++++-- drivers/media/v4l2-core/v4l2-ctrls.c | 15 +++ include/uapi/linux/v4l2-controls.h | 16 +++ 6 files changed, 243 insertions(+), 13 deletions(-)
Signature · 1 line
2.7.4
PATCH v4 1/3 media: v4l2-ctrl: Add frame-specific min/max qp controls for hevc
- Adds min/max qp controls for B frame for h264.
- Adds min/max qp controls for I/P/B frames for hevc similar to h264.
- Update valid range of min/max qp for hevc to accommodate 10 bit.
--- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 52 +++++++++++++++++++++- drivers/media/v4l2-core/v4l2-ctrls.c | 8 ++++ include/uapi/linux/v4l2-controls.h | 9 ++++ 3 files changed, 67 insertions(+), 2 deletions(-)
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +50 -2
@@ -1182,6 +1182,18 @@ enum v4l2_mpeg_video_h264_entropy_mode - V4L2_CID_MPEG_VIDEO_H264_MAX_QP is also set, the quantization parameter should be chosen to meet both requirements. +``V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP (integer)`` + Minimum quantization parameter for the H264 B frame to limit B frame + quality to a range. Valid range: from 0 to 51. If + V4L2_CID_MPEG_VIDEO_H264_MIN_QP is also set, the quantization parameter + should be chosen to meet both requirements. + +``V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP (integer)`` + Maximum quantization parameter for the H264 B frame to limit B frame + quality to a range. Valid range: from 0 to 51. If + V4L2_CID_MPEG_VIDEO_H264_MAX_QP is also set, the quantization parameter + should be chosen to meet both requirements. + ``V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (integer)`` Quantization parameter for an I frame for MPEG4. Valid range: from 1 to 31.
@@ -2628,11 +2640,11 @@ HEVC/H.265 Control IDs ``V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP (integer)`` Minimum quantization parameter for HEVC. - Valid range: from 0 to 51. + Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit. ``V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP (integer)`` Maximum quantization parameter for HEVC. - Valid range: from 0 to 51. + Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit. ``V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP (integer)`` Quantization parameter for an I frame for HEVC.
@@ -2649,6 +2661,42 @@ HEVC/H.265 Control IDs Valid range: [V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP, V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP]. +``V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP (integer)`` + Minimum quantization parameter for the HEVC I frame to limit I frame + quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit. + If V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP is also set, the quantization parameter + should be chosen to meet both requirements. + +``V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP (integer)`` + Maximum quantization parameter for the HEVC I frame to limit I frame + quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit. + If V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP is also set, the quantization parameter + should be chosen to meet both requirements. + +``V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP (integer)`` + Minimum quantization parameter for the HEVC P frame to limit P frame + quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit. + If V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP is also set, the quantization parameter + should be chosen to meet both requirements. + +``V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP (integer)`` + Maximum quantization parameter for the HEVC P frame to limit P frame + quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit. + If V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP is also set, the quantization parameter + should be chosen to meet both requirements. + +``V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP (integer)`` + Minimum quantization parameter for the HEVC B frame to limit B frame + quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit. + If V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP is also set, the quantization parameter + should be chosen to meet both requirements. + +``V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP (integer)`` + Maximum quantization parameter for the HEVC B frame to limit B frame + quality to a range. Valid range: from 0 to 51 for 8 bit and from 0 to 63 for 10 bit. + If V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP is also set, the quantization parameter + should be chosen to meet both requirements. + ``V4L2_CID_MPEG_VIDEO_HEVC_HIER_QP (boolean)`` HIERARCHICAL_QP allows the host to specify the quantization parameter values for each temporal layer through HIERARCHICAL_QP_LAYER. This is
drivers/media/v4l2-core/v4l2-ctrls.c +8 -0
@@ -920,6 +920,8 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP :return "H264 I-Frame Maximum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP :return "H264 P-Frame Minimum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP :return "H264 P-Frame Maximum QP Value" ; +case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP :return "H264 B-Frame Minimum QP Value" ; +case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP :return "H264 B-Frame Maximum QP Value" ;case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :return "MPEG2 Level" ;case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE :return "MPEG2 Profile" ;case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP :return "MPEG4 I-Frame QP Value" ;
@@ -969,6 +971,12 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP :return "HEVC B-Frame QP Value" ;case V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP :return "HEVC Minimum QP Value" ;case V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP :return "HEVC Maximum QP Value" ; +case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP :return "HEVC I-Frame Minimum QP Value" ; +case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP :return "HEVC I-Frame Maximum QP Value" ; +case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP :return "HEVC P-Frame Minimum QP Value" ; +case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP :return "HEVC P-Frame Maximum QP Value" ; +case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP :return "HEVC B-Frame Minimum QP Value" ; +case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP :return "HEVC B-Frame Maximum QP Value" ;case V4L2_CID_MPEG_VIDEO_HEVC_PROFILE :return "HEVC Profile" ;case V4L2_CID_MPEG_VIDEO_HEVC_LEVEL :return "HEVC Level" ;case V4L2_CID_MPEG_VIDEO_HEVC_TIER :return "HEVC Tier" ;
include/uapi/linux/v4l2-controls.h +9 -0
@@ -585,6 +585,8 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type {#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP (V4L2_CID_CODEC_BASE+386)#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP (V4L2_CID_CODEC_BASE+387)#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP (V4L2_CID_CODEC_BASE+388) +#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP (V4L2_CID_CODEC_BASE+389) +#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP (V4L2_CID_CODEC_BASE+390)#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_CODEC_BASE+400)#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_CODEC_BASE+401)#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_CODEC_BASE+402)
@@ -775,6 +777,13 @@ enum v4l2_mpeg_video_frame_skip_mode { V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT = 2, }; +#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP (V4L2_CID_CODEC_BASE + 647) +#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP (V4L2_CID_CODEC_BASE + 648) +#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP (V4L2_CID_CODEC_BASE + 649) +#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP (V4L2_CID_CODEC_BASE + 650) +#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP (V4L2_CID_CODEC_BASE + 651) +#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP (V4L2_CID_CODEC_BASE + 652) +/* 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)
Signature · 1 line
2.7.4
PATCH v4 2/3 media: v4l2-ctrl: Add layer wise bitrate controls for h264
In reply to Dikshita AgarwalAdds bitrate control for all coding layers for h264 same as hevc.
--- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 20 ++++++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 7 +++++++ include/uapi/linux/v4l2-controls.h | 7 +++++++ 3 files changed, 34 insertions(+)
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +20 -0
@@ -1513,6 +1513,26 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - * - Bit 16:32 - Layer number +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR (integer)`` + Indicates bit rate (bps) for hierarchical coding layer 0 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR (integer)`` + Indicates bit rate (bps) for hierarchical coding layer 1 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR (integer)`` + Indicates bit rate (bps) for hierarchical coding layer 2 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR (integer)`` + Indicates bit rate (bps) for hierarchical coding layer 3 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR (integer)`` + Indicates bit rate (bps) for hierarchical coding layer 4 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR (integer)`` + Indicates bit rate (bps) for hierarchical coding layer 5 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L6_BR (integer)`` + Indicates bit rate (bps) for hierarchical coding layer 6 for H264 encoder. .. _v4l2-mpeg-mpeg2:
drivers/media/v4l2-core/v4l2-ctrls.c +7 -0
@@ -922,6 +922,13 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP :return "H264 P-Frame Maximum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP :return "H264 B-Frame Minimum QP Value" ;case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP :return "H264 B-Frame Maximum QP Value" ; +case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR :return "H264 Hierarchical Lay 0 Bitrate" ; +case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR :return "H264 Hierarchical Lay 1 Bitrate" ; +case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR :return "H264 Hierarchical Lay 2 Bitrate" ; +case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR :return "H264 Hierarchical Lay 3 Bitrate" ; +case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR :return "H264 Hierarchical Lay 4 Bitrate" ; +case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR :return "H264 Hierarchical Lay 5 Bitrate" ; +case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L6_BR :return "H264 Hierarchical Lay 6 Bitrate" ;case V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL :return "MPEG2 Level" ;case V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE :return "MPEG2 Profile" ;case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP :return "MPEG4 I-Frame QP Value" ;
include/uapi/linux/v4l2-controls.h +7 -0
@@ -587,6 +587,13 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type {#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP (V4L2_CID_CODEC_BASE+388)#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP (V4L2_CID_CODEC_BASE+389)#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP (V4L2_CID_CODEC_BASE+390) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR (V4L2_CID_CODEC_BASE+391) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR (V4L2_CID_CODEC_BASE+392) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR (V4L2_CID_CODEC_BASE+393) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR (V4L2_CID_CODEC_BASE+394) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR (V4L2_CID_CODEC_BASE+395) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR (V4L2_CID_CODEC_BASE+396) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L6_BR (V4L2_CID_CODEC_BASE+397)#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_CODEC_BASE+400)#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_CODEC_BASE+401)#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_CODEC_BASE+402)
Signature · 1 line
2.7.4
PATCH v4 3/3 venus: venc: Add support for frame-specific min/max qp controls
In reply to Dikshita AgarwalAdd support for frame type specific min and max qp controls for encoder.
This is a preparation patch to support v6.
--- drivers/media/platform/qcom/venus/core.h | 18 ++++ drivers/media/platform/qcom/venus/venc.c | 21 +++-- drivers/media/platform/qcom/venus/venc_ctrls.c | 114 +++++++++++++++++++++++-- 3 files changed, 142 insertions(+), 11 deletions(-)
drivers/media/platform/qcom/venus/core.h +18 -0
@@ -230,10 +230,28 @@ struct venc_controls {u32 h264_b_qp;u32 h264_min_qp;u32 h264_max_qp; +u32 h264_i_min_qp; +u32 h264_i_max_qp; +u32 h264_p_min_qp; +u32 h264_p_max_qp; +u32 h264_b_min_qp; +u32 h264_b_max_qp;u32 h264_loop_filter_mode;s32 h264_loop_filter_alpha;s32 h264_loop_filter_beta; +u32 hevc_i_qp; +u32 hevc_p_qp; +u32 hevc_b_qp; +u32 hevc_min_qp; +u32 hevc_max_qp; +u32 hevc_i_min_qp; +u32 hevc_i_max_qp; +u32 hevc_p_min_qp; +u32 hevc_p_max_qp; +u32 hevc_b_min_qp; +u32 hevc_b_max_qp; +u32 vp8_min_qp;u32 vp8_max_qp;
drivers/media/platform/qcom/venus/venc.c +16 -5
@@ -669,17 +669,28 @@ static int venc_set_properties(struct venus_inst *inst)return ret; ptype =HFI_PROPERTY_PARAM_VENC_SESSION_QP ; - quant.qp_i = ctr->h264_i_qp; - quant.qp_p = ctr->h264_p_qp; - quant.qp_b = ctr->h264_b_qp; +if (inst->fmt_cap->pixfmt ==V4L2_PIX_FMT_HEVC ) { + quant.qp_i = ctr->hevc_i_qp; + quant.qp_p = ctr->hevc_p_qp; + quant.qp_b = ctr->hevc_b_qp; + }else { + quant.qp_i = ctr->h264_i_qp; + quant.qp_p = ctr->h264_p_qp; + quant.qp_b = ctr->h264_b_qp; + } quant.layer_id =0 ; ret =hfi_session_set_property (inst, ptype, &quant);if (ret)return ret; ptype =HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE ; - quant_range.min_qp = ctr->h264_min_qp; - quant_range.max_qp = ctr->h264_max_qp; +if (inst->fmt_cap->pixfmt ==V4L2_PIX_FMT_HEVC ) { + quant_range.min_qp = ctr->hevc_min_qp; + quant_range.max_qp = ctr->hevc_max_qp; + }else { + quant_range.min_qp = ctr->h264_min_qp; + quant_range.max_qp = ctr->h264_max_qp; + } quant_range.layer_id =0 ; ret =hfi_session_set_property (inst, ptype, &quant_range);if (ret)
drivers/media/platform/qcom/venus/venc_ctrls.c +108 -6
143 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [PATCH v4 3/3] venus: venc: Add support for frame-specific min/max qp controls
Quoted 10 lines · Dikshita Agarwal
Add support for frame type specific min and max qp controls for encoder.
This is a preparation patch to support v6.Signed-off-by Dikshita Agarwal <[email protected]>--- drivers/media/platform/qcom/venus/core.h | 18 ++++ drivers/media/platform/qcom/venus/venc.c | 21 +++-- drivers/media/platform/qcom/venus/venc_ctrls.c | 114 +++++++++++++++++++++++-- 3 files changed, 142 insertions(+), 11 deletions(-)
Signature · 2 lines
regards, Stan
This series was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This series was applied to qcom/linux.git (refs/heads/for-next):
Quoted 8 lines · On Thu, 24 Dec 2020 16:55:32 +0530 you wrote:
This series adds frame specific min/max qp controls for hevc and layer wise bitrate control for h264.
Chnages since v2:
- Rebased the changes on latest media tree
- Added driver side implementation for new controls.[...]
Here is the summary with links:
- [v4,1/3] media: v4l2-ctrl: Add frame-specific min/max qp controls for hevc
https://git.kernel.org/qcom/c/99d0cbe4be78 - [v4,2/3] media: v4l2-ctrl: Add layer wise bitrate controls for h264 https://git.kernel.org/qcom/c/4ca134ee9823 - [v4,3/3] venus: venc: Add support for frame-specific min/max qp controls https://git.kernel.org/qcom/c/74c895974fd3
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html