Add new controls for QP and layer bitrate
Subsystems (2)
v2 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.
Chnage since v1:
corrected email.
Dikshita Agarwal (2):
media: v4l2-ctrl: Add frame-specific min/max qp controls for hevc
media: v4l2-ctrl: Add layer wise bitrate controls for h264
.../userspace-api/media/v4l/ext-ctrls-codec.rst | 74 +++++++++++++++++++++- drivers/media/v4l2-core/v4l2-ctrls.c | 15 +++++ include/uapi/linux/v4l2-controls.h | 17 +++++ 3 files changed, 104 insertions(+), 2 deletions(-)
Signature · 1 line
1.9.1
PATCH v2 1/2 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 mim/max qp for hevc to accommodate 10 bit.
--- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 54 +++++++++++++++++++++- drivers/media/v4l2-core/v4l2-ctrls.c | 8 ++++ include/uapi/linux/v4l2-controls.h | 9 ++++ 3 files changed, 69 insertions(+), 2 deletions(-)
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +52 -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.
@@ -3441,11 +3453,13 @@ 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 - 51 for 8 bit and + 0 - 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 - 51 for 8 bit and + 0 - 63 for 10 bit ``V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP (integer)`` Quantization parameter for an I frame for HEVC.
@@ -3462,6 +3476,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, 0 - 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, 0 - 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, 0 - 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, 0 - 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, 0 - 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, 0 - 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_H264_SPS :return "H264 Sequence Parameter Set" ;case V4L2_CID_MPEG_VIDEO_H264_PPS :return "H264 Picture Parameter Set" ;case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ;
@@ -978,6 +980,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
@@ -578,6 +578,8 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type {#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+386)#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+387)#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+388) +#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+389) +#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+390)#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_MPEG_BASE+400)#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_MPEG_BASE+401)#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_MPEG_BASE+402)
@@ -762,6 +764,13 @@ enum v4l2_cid_mpeg_video_hevc_size_of_length_field {#define V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR (V4L2_CID_MPEG_BASE + 644)#define V4L2_CID_MPEG_VIDEO_CONSTANT_QUALITY (V4L2_CID_MPEG_BASE + 645)#define V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE (V4L2_CID_MPEG_BASE + 646) +#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+647) +#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+648) +#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+649) +#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+650) +#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+651) +#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+652) +enum v4l2_mpeg_video_frame_skip_mode {V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED =0 ,V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT =1 ,
Signature · 1 line
1.9.1
Re: [PATCH v2 1/2] media: v4l2-ctrl: Add frame-specific min/max qp controls for hevc
Quoted 35 lines · Dikshita Agarwal
- 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 mim/max qp for hevc to accommodate 10 bit.Signed-off-by Dikshita Agarwal <[email protected]>--- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 54 +++++++++++++++++++++- drivers/media/v4l2-core/v4l2-ctrls.c | 8 ++++ include/uapi/linux/v4l2-controls.h | 9 ++++ 3 files changed, 69 insertions(+), 2 deletions(-)Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +12
-0@@ -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.
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst HEVC/H.265 Control IDs · line 3457
Quoted 6 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +2
-1@@ -3441,11 +3453,13 @@ 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 - 51 for 8 bit and + 0 - 63 for 10 bit.
This can be on one line.
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst HEVC/H.265 Control IDs · line 3462
Quoted 6 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +2
-1``V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP (integer)`` Maximum quantization parameter for HEVC. - Valid range: from 0 to 51. + Valid range: from 0 - 51 for 8 bit and + 0 - 63 for 10 bit
Same here, but this is also missing a period at the end.
Quoted 90 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +36
-0``V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP (integer)`` Quantization parameter for an I frame for HEVC.@@ -3462,6 +3476,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, 0 - 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, 0 - 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, 0 - 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, 0 - 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, 0 - 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, 0 - 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 isdrivers/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_H264_SPS :return "H264 Sequence Parameter Set" ;case V4L2_CID_MPEG_VIDEO_H264_PPS :return "H264 Picture Parameter Set" ;case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ;@@ -978,6 +980,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 +2
-0@@ -578,6 +578,8 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type {#define V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+386)#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+387)#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+388) +#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+389) +#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+390)#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_MPEG_BASE+400)#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_MPEG_BASE+401)#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_MPEG_BASE+402)@@ -762,6 +764,13 @@ enum v4l2_cid_mpeg_video_hevc_size_of_length_field {#define V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR (V4L2_CID_MPEG_BASE + 644)#define V4L2_CID_MPEG_VIDEO_CONSTANT_QUALITY (V4L2_CID_MPEG_BASE + 645)#define V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE (V4L2_CID_MPEG_BASE + 646)
include/uapi/linux/v4l2-controls.h enum v4l2_cid_mpeg_video_hevc_size_of_length_field { · line 776
Quoted 10 lines
include/uapi/linux/v4l2-controls.h +7
-0+#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+647) +#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+648) +#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+649) +#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+650) +#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+651) +#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+652) +enum v4l2_mpeg_video_frame_skip_mode {V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED =0 ,V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT =1 ,
Regards,
Hans
PATCH v2 2/2 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 | 8 ++++++++ 3 files changed, 35 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 for hierarchical coding layer 0 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR (integer)`` + Indicates bit rate for hierarchical coding layer 1 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR (integer)`` + Indicates bit rate for hierarchical coding layer 2 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR (integer)`` + Indicates bit rate for hierarchical coding layer 3 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR (integer)`` + Indicates bit rate for hierarchical coding layer 4 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR (integer)`` + Indicates bit rate for hierarchical coding layer 5 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L6_BR (integer)`` + Indicates bit rate for hierarchical coding layer 6 for H264 encoder. .. _v4l2-mpeg-h264:
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_H264_SPS :return "H264 Sequence Parameter Set" ;case V4L2_CID_MPEG_VIDEO_H264_PPS :return "H264 Picture Parameter Set" ;case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ;
include/uapi/linux/v4l2-controls.h +8 -0
@@ -580,12 +580,20 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type {#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+388)#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+389)#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+390) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR (V4L2_CID_MPEG_BASE + 391) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR (V4L2_CID_MPEG_BASE + 392) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR (V4L2_CID_MPEG_BASE + 393) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR (V4L2_CID_MPEG_BASE + 394) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR (V4L2_CID_MPEG_BASE + 395) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR (V4L2_CID_MPEG_BASE + 396) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L6_BR (V4L2_CID_MPEG_BASE + 397)#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_MPEG_BASE+400)#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_MPEG_BASE+401)#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_MPEG_BASE+402)#define V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP (V4L2_CID_MPEG_BASE+403)#define V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP (V4L2_CID_MPEG_BASE+404)#define V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL (V4L2_CID_MPEG_BASE+405) +enum v4l2_mpeg_video_mpeg4_level {V4L2_MPEG_VIDEO_MPEG4_LEVEL_0 =0 ,V4L2_MPEG_VIDEO_MPEG4_LEVEL_0B =1 ,
Signature · 1 line
1.9.1
Re: [PATCH v2 2/2] media: v4l2-ctrl: Add layer wise bitrate controls for h264
Quoted 28 lines · Dikshita Agarwal
Adds bitrate control for all coding layers for h264 same as hevc.
Signed-off-by Dikshita Agarwal <[email protected]>--- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 20 ++++++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 7 +++++++ include/uapi/linux/v4l2-controls.h | 8 ++++++++ 3 files changed, 35 insertions(+)Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +10
-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 for hierarchical coding layer 0 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR (integer)`` + Indicates bit rate for hierarchical coding layer 1 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR (integer)`` + Indicates bit rate for hierarchical coding layer 2 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR (integer)``
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_h264_hierarchical_coding_type - · line 1535
Quoted 10 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +10
-0+ Indicates bit rate for hierarchical coding layer 3 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR (integer)`` + Indicates bit rate for hierarchical coding layer 4 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR (integer)`` + Indicates bit rate for hierarchical coding layer 5 for H264 encoder. + +``V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L6_BR (integer)`` + Indicates bit rate for hierarchical coding layer 6 for H264 encoder.
The unit isn't specified here. I assume it is bits per second, but that should be stated explicitly.
Quoted 8 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +0
-0.. _v4l2-mpeg-h264:drivers/media/v4l2-core/v4l2-ctrls.c +0
-0
drivers/media/v4l2-core/v4l2-ctrls.c const char *v4l2_ctrl_get_name(u32 id) · line 931
Quoted 10 lines
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" ;
BitRate -> Bitrate
Quoted 19 lines
drivers/media/v4l2-core/v4l2-ctrls.c +0
-0case V4L2_CID_MPEG_VIDEO_H264_SPS :return "H264 Sequence Parameter Set" ;case V4L2_CID_MPEG_VIDEO_H264_PPS :return "H264 Picture Parameter Set" ;case V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX :return "H264 Scaling Matrix" ;include/uapi/linux/v4l2-controls.h +7
-0@@ -580,12 +580,20 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type {#define V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+388)#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP (V4L2_CID_MPEG_BASE+389)#define V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP (V4L2_CID_MPEG_BASE+390) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR (V4L2_CID_MPEG_BASE + 391) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR (V4L2_CID_MPEG_BASE + 392) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR (V4L2_CID_MPEG_BASE + 393) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR (V4L2_CID_MPEG_BASE + 394) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR (V4L2_CID_MPEG_BASE + 395) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR (V4L2_CID_MPEG_BASE + 396) +#define V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L6_BR (V4L2_CID_MPEG_BASE + 397)
include/uapi/linux/v4l2-controls.h enum v4l2_mpeg_video_h264_hierarchical_coding_type { · line 599
Quoted 10 lines
include/uapi/linux/v4l2-controls.h +1
-0#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_MPEG_BASE+400)#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_MPEG_BASE+401)#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_MPEG_BASE+402)#define V4L2_CID_MPEG_VIDEO_MPEG4_MIN_QP (V4L2_CID_MPEG_BASE+403)#define V4L2_CID_MPEG_VIDEO_MPEG4_MAX_QP (V4L2_CID_MPEG_BASE+404)#define V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL (V4L2_CID_MPEG_BASE+405) +enum v4l2_mpeg_video_mpeg4_level {V4L2_MPEG_VIDEO_MPEG4_LEVEL_0 =0 ,V4L2_MPEG_VIDEO_MPEG4_LEVEL_0B =1 ,
Regards,
Hans
Quoted 2 lines · Dikshita Agarwal
This series adds frame specific min/max qp controls for hevc and layer wise bitrate control for h264.
Any chance you could append your driver changes with this set ? I don't think new APIs ever make it without a driver using it.
Quoted 13 lines
Chnage since v1:
corrected email.Dikshita Agarwal (2):
media: v4l2-ctrl: Add frame-specific min/max qp controls for hevc
media: v4l2-ctrl: Add layer wise bitrate controls for h264.../userspace-api/media/v4l/ext-ctrls-codec.rst | 74 +++++++++++++++++++++- drivers/media/v4l2-core/v4l2-ctrls.c | 15 +++++ include/uapi/linux/v4l2-controls.h | 17 +++++ 3 files changed, 104 insertions(+), 2 deletions(-)
Quoted 6 lines · Nicolas Dufresne
Quoted 2 lines · Dikshita Agarwal
This series adds frame specific min/max qp controls for hevc and layer wise bitrate control for h264.
Any chance you could append your driver changes with this set ? I don't think new APIs ever make it without a driver using it.
Indeed. I'll mark this as 'Changes Requested' in patchwork: I do need a version that actually uses these new controls in a driver.
Regards,
Hans
Quoted 15 lines
Quoted 14 lines
Chnage since v1:
corrected email.Dikshita Agarwal (2):
media: v4l2-ctrl: Add frame-specific min/max qp controls for hevc
media: v4l2-ctrl: Add layer wise bitrate controls for h264.../userspace-api/media/v4l/ext-ctrls-codec.rst | 74 +++++++++++++++++++++- drivers/media/v4l2-core/v4l2-ctrls.c | 15 +++++ include/uapi/linux/v4l2-controls.h | 17 +++++ 3 files changed, 104 insertions(+), 2 deletions(-)