Add encoder ctrls for long term reference
Subsystems (4)
v7 cover Add encoder ctrls for long term reference
This series add the encoder controls for long term reference (LTR) and support for the same in venus driver.
Dikshita Agarwal (2):
media: v4l2-ctrl: add controls for long term reference.
venus: venc: Add support for Long Term Reference (LTR) controls
Changes since v6:
- removed references of Request API from documentation.
- addressed other comments.
.../userspace-api/media/v4l/ext-ctrls-codec.rst | 17 ++++++++ drivers/media/platform/qcom/venus/venc_ctrls.c | 49 +++++++++++++++++++++- drivers/media/v4l2-core/v4l2-ctrls.c | 14 +++++++ include/uapi/linux/v4l2-controls.h | 3 ++ 4 files changed, 82 insertions(+), 1 deletion(-)
Signature · 1 line
2.7.4
PATCH v7 1/2 media: v4l2-ctrl: add controls for long term reference.
Long Term Reference (LTR) frames are the frames that are encoded sometime in the past and stored in the DPB buffer list to be used as reference to encode future frames.
This change adds controls to enable this feature.
--- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 17 +++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 14 ++++++++++++++ include/uapi/linux/v4l2-controls.h | 3 +++ 3 files changed, 34 insertions(+)
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +17 -0
@@ -3646,3 +3646,20 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - so this has to come from client. This is applicable to H264 and valid Range is from 0 to 63. Source Rec. ITU-T H.264 (06/2019); G.7.4.1.1, G.8.8.1. + +``V4L2_CID_MPEG_VIDEO_LTR_COUNT (integer)`` + Specifies the maximum number of Long Term Reference (LTR) frames at any + given time that the encoder can keep. + This is applicable to the H264 and HEVC encoders. + +``V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX (integer)`` + The current frame is marked as a Long Term Reference (LTR) frame + and given this LTR index which ranges from 0 to LTR_COUNT-1. + This is applicable to the H264 and HEVC encoders. + Source Rec. ITU-T H.264 (06/2019); Table 7.9 + +``V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES (bitmask)`` + Specifies the Long Term Reference (LTR) frame(s) to be used for + encoding the current frame. + This provides a bitmask which consists of bits [0, LTR_COUNT-1]. + This is applicable to the H264 and HEVC encoders.
drivers/media/v4l2-core/v4l2-ctrls.c +14 -0
@@ -951,6 +951,9 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER :return "Repeat Sequence Header" ;case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME :return "Force Key Frame" ;case V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID :return "Base Layer Priority ID" ; +case V4L2_CID_MPEG_VIDEO_LTR_COUNT :return "LTR Count" ; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX :return "Frame LTR Index" ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES :return "Use LTR Frames" ;case V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS :return "MPEG-2 Slice Parameters" ;case V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION :return "MPEG-2 Quantization Matrices" ;case V4L2_CID_FWHT_I_FRAME_QP :return "FWHT I-Frame QP Value" ;
@@ -1278,6 +1281,17 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE : *type =V4L2_CTRL_TYPE_INTEGER ;break ; +case V4L2_CID_MPEG_VIDEO_LTR_COUNT : + *type =V4L2_CTRL_TYPE_INTEGER ; +break ; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX : + *type =V4L2_CTRL_TYPE_INTEGER ; + *flags |=V4L2_CTRL_FLAG_EXECUTE_ON_WRITE ; +break ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES : + *type =V4L2_CTRL_TYPE_BITMASK ; + *flags |=V4L2_CTRL_FLAG_EXECUTE_ON_WRITE ; +break ;case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME :case V4L2_CID_PAN_RESET :case V4L2_CID_TILT_RESET :
include/uapi/linux/v4l2-controls.h +3 -0
@@ -428,6 +428,9 @@ enum v4l2_mpeg_video_multi_slice_mode {#define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE (V4L2_CID_CODEC_BASE+228)#define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME (V4L2_CID_CODEC_BASE+229)#define V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID (V4L2_CID_CODEC_BASE+230) +#define V4L2_CID_MPEG_VIDEO_LTR_COUNT (V4L2_CID_CODEC_BASE+231) +#define V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX (V4L2_CID_CODEC_BASE+232) +#define V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES (V4L2_CID_CODEC_BASE+233)/* CIDs for the MPEG-2 Part 2 (H.262) codec */ #define V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL (V4L2_CID_CODEC_BASE+270)
Signature · 1 line
2.7.4
Re: [PATCH v7 1/2] media: v4l2-ctrl: add controls for long term reference.
Hi Dikshita,
Quoted 18 lines · Dikshita Agarwal
Long Term Reference (LTR) frames are the frames that are encoded sometime in the past and stored in the DPB buffer list to be used as reference to encode future frames.
This change adds controls to enable this feature.Signed-off-by Dikshita Agarwal <[email protected]>--- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 17 +++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 14 ++++++++++++++ include/uapi/linux/v4l2-controls.h | 3 +++ 3 files changed, 34 insertions(+)Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +0
-0@@ -3646,3 +3646,20 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - so this has to come from client.
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_hevc_size_of_length_field - · line 3656
Quoted 10 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +8
-0This is applicable to H264 and valid Range is from 0 to 63. Source Rec. ITU-T H.264 (06/2019); G.7.4.1.1, G.8.8.1. + +``V4L2_CID_MPEG_VIDEO_LTR_COUNT (integer)`` + Specifies the maximum number of Long Term Reference (LTR) frames at any + given time that the encoder can keep. + This is applicable to the H264 and HEVC encoders. + +``V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX (integer)`` + The current frame is marked as a Long Term Reference (LTR) frame
You mentioned earlier in a reply to me that:
"The driver implementation ensures that whenever the LTR control is received, it applies to the frame received after that. Not to frame which would be encoded next."
That behavior is not clear from the text.
Wouldn't this be a better text:
"After setting this control the frame that will be queued next
will be marked as a Long Term Reference (LTR) frame"
"current frame" isn't precise enough.
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_hevc_size_of_length_field - · line 3663
Quoted 7 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +7
-0+ and given this LTR index which ranges from 0 to LTR_COUNT-1. + This is applicable to the H264 and HEVC encoders. + Source Rec. ITU-T H.264 (06/2019); Table 7.9 + +``V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES (bitmask)`` + Specifies the Long Term Reference (LTR) frame(s) to be used for + encoding the current frame.
Same here. I assume that here too this control applies to the next queued frame.
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_hevc_size_of_length_field - · line 3665
Quoted 2 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +2
-0+ This provides a bitmask which consists of bits [0, LTR_COUNT-1]. + This is applicable to the H264 and HEVC encoders.
Regards,
Hans
Quoted 47 lines
drivers/media/v4l2-core/v4l2-ctrls.c +14
-0@@ -951,6 +951,9 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER :return "Repeat Sequence Header" ;case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME :return "Force Key Frame" ;case V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID :return "Base Layer Priority ID" ; +case V4L2_CID_MPEG_VIDEO_LTR_COUNT :return "LTR Count" ; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX :return "Frame LTR Index" ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES :return "Use LTR Frames" ;case V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS :return "MPEG-2 Slice Parameters" ;case V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION :return "MPEG-2 Quantization Matrices" ;case V4L2_CID_FWHT_I_FRAME_QP :return "FWHT I-Frame QP Value" ;@@ -1278,6 +1281,17 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE : *type =V4L2_CTRL_TYPE_INTEGER ;break ; +case V4L2_CID_MPEG_VIDEO_LTR_COUNT : + *type =V4L2_CTRL_TYPE_INTEGER ; +break ; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX : + *type =V4L2_CTRL_TYPE_INTEGER ; + *flags |=V4L2_CTRL_FLAG_EXECUTE_ON_WRITE ; +break ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES : + *type =V4L2_CTRL_TYPE_BITMASK ; + *flags |=V4L2_CTRL_FLAG_EXECUTE_ON_WRITE ; +break ;case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME :case V4L2_CID_PAN_RESET :case V4L2_CID_TILT_RESET :include/uapi/linux/v4l2-controls.h +3
-0@@ -428,6 +428,9 @@ enum v4l2_mpeg_video_multi_slice_mode {#define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE (V4L2_CID_CODEC_BASE+228)#define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME (V4L2_CID_CODEC_BASE+229)#define V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID (V4L2_CID_CODEC_BASE+230) +#define V4L2_CID_MPEG_VIDEO_LTR_COUNT (V4L2_CID_CODEC_BASE+231) +#define V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX (V4L2_CID_CODEC_BASE+232) +#define V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES (V4L2_CID_CODEC_BASE+233)/* CIDs for the MPEG-2 Part 2 (H.262) codec */ #define V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL (V4L2_CID_CODEC_BASE+270)
Re: [PATCH v7 1/2] media: v4l2-ctrl: add controls for long term reference.
Hi Hans,
Thanks for your comments.
I Will update the documentation based on your suggestion in the next patch.
Thanks,
Dikshita
Quoted 126 lines · Hans Verkuil
Hi Dikshita,
Quoted 27 lines · Dikshita Agarwal
Long Term Reference (LTR) frames are the frames that are encoded sometime in the past and stored in the DPB buffer list to be used as reference to encode future frames.
This change adds controls to enable this feature.Signed-off-by Dikshita Agarwal <[email protected]>--- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 17 +++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 14 ++++++++++++++ include/uapi/linux/v4l2-controls.h | 3 +++ 3 files changed, 34 insertions(+)Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +3
-1@@ -3646,3 +3646,20 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - so this has to come from client. This is applicable to H264 and valid Range is from 0 to 63. Source Rec. ITU-T H.264 (06/2019); G.7.4.1.1, G.8.8.1. + +``V4L2_CID_MPEG_VIDEO_LTR_COUNT (integer)`` + Specifies the maximum number of Long Term Reference (LTR) framesat any
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_hevc_size_of_length_field - · line 3656
Quoted 5 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +5
-0+ given time that the encoder can keep. + This is applicable to the H264 and HEVC encoders. + +``V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX (integer)`` + The current frame is marked as a Long Term Reference (LTR) frameYou mentioned earlier in a reply to me that:
"The driver implementation ensures that whenever the LTR control is received, it applies to the frame received after that. Not to frame which would be
encoded next."That behavior is not clear from the text.
Wouldn't this be a better text:
"After setting this control the frame that will be queued next
will be marked as a Long Term Reference (LTR) frame""current frame" isn't precise enough.
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_hevc_size_of_length_field - · line 3663
Quoted 7 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +7
-0+ and given this LTR index which ranges from 0 to LTR_COUNT-1. + This is applicable to the H264 and HEVC encoders. + Source Rec. ITU-T H.264 (06/2019); Table 7.9 + +``V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES (bitmask)`` + Specifies the Long Term Reference (LTR) frame(s) to be used for + encoding the current frame.Same here. I assume that here too this control applies to the next queued frame.
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_hevc_size_of_length_field - · line 3665
Quoted 2 lines
Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +2
-0+ This provides a bitmask which consists of bits [0, LTR_COUNT-1]. + This is applicable to the H264 and HEVC encoders.Regards,
Hans
Quoted 56 lines
drivers/media/v4l2-core/v4l2-ctrls.c +3
-0@@ -951,6 +951,9 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER :return "Repeat Sequence Header";case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME :return "Force Key Frame" ; case V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID: return "Base Layer Priority ID"; + case V4L2_CID_MPEG_VIDEO_LTR_COUNT: return "LTR Count"; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX :return "Frame LTR Index" ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES :return "Use LTR Frames" ; case V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS: return "MPEG-2 SliceParameters";
caseV4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION: return "MPEG-2
Quantization Matrices";drivers/media/v4l2-core/v4l2-ctrls.c +11
-0case V4L2_CID_FWHT_I_FRAME_QP :return "FWHT I-Frame QP Value" ;@@ -1278,6 +1281,17 @@ void v4l2_ctrl_fill(u32 id, const char **name,enum v4l2_ctrl_type *type, case V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE: *type =V4L2_CTRL_TYPE_INTEGER ;break ; +case V4L2_CID_MPEG_VIDEO_LTR_COUNT : + *type =V4L2_CTRL_TYPE_INTEGER ; +break ; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX : + *type =V4L2_CTRL_TYPE_INTEGER ; + *flags |=V4L2_CTRL_FLAG_EXECUTE_ON_WRITE ; +break ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES : + *type =V4L2_CTRL_TYPE_BITMASK ; + *flags |=V4L2_CTRL_FLAG_EXECUTE_ON_WRITE ; +break ;case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME :case V4L2_CID_PAN_RESET :drivers/media/v4l2-core/v4l2-ctrls.c +0
-0case V4L2_CID_TILT_RESET :include/uapi/linux/v4l2-controls.h +2
-0@@ -428,6 +428,9 @@ enum v4l2_mpeg_video_multi_slice_mode {#define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE (V4L2_CID_CODEC_BASE+228)#define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME (V4L2_CID_CODEC_BASE+229)#define V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID (V4L2_CID_CODEC_BASE+230) +#define V4L2_CID_MPEG_VIDEO_LTR_COUNT (V4L2_CID_CODEC_BASE+231) +#define
V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX(V4L2_CID_CODEC_BASE+232)
+#defineV4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES(V4L2_CID_CODEC_BASE+233)/* CIDs for the MPEG-2 Part 2 (H.262) codec */
#defineV4L2_CID_MPEG_VIDEO_MPEG2_LEVEL(V4L2_CID_CODEC_BASE+270)
PATCH v7 2/2 venus: venc: Add support for Long Term Reference (LTR) controls
In reply to Dikshita AgarwalAdd support for below LTR controls in encoder:
- V4L2_CID_MPEG_VIDEO_LTR_COUNT
- V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX
- V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES
--- drivers/media/platform/qcom/venus/venc_ctrls.c | 49 +++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/venus/venc_ctrls.c +48 -1
@@ -20,6 +20,7 @@#define INTRA_REFRESH_MBS_MAX 300#define AT_SLICE_BOUNDARY \ V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY +#define MAX_LTR_FRAME_COUNT 4static int venc_calc_bpframes (u32 gop_size,u32 conseq_b,u32 *bf,u32 *pf) {
@@ -72,6 +73,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)struct venc_controls *ctr = &inst->controls.enc;struct hfi_enable en = { .enable =1 };struct hfi_bitrate brate; +struct hfi_ltr_use ltr_use; +struct hfi_ltr_mark ltr_mark; +struct hfi_ltr_mode ltr_mode;u32 bframes;u32 ptype;int ret;
@@ -276,6 +280,37 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID : ctr->base_priority_id = ctrl->val;break ; +case V4L2_CID_MPEG_VIDEO_LTR_COUNT : + ptype =HFI_PROPERTY_PARAM_VENC_LTRMODE ; + ltr_mode.ltr_count = ctrl->val; + ltr_mode.ltr_mode =HFI_LTR_MODE_MANUAL ; + ltr_mode.trust_mode =1 ; + ret =hfi_session_set_property (inst, ptype, <r_mode); +if (ret) { +mutex_unlock (&inst->lock); +return ret; + } +break ; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX : + ptype =HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME ; + ltr_mark.mark_frame = ctrl->val; + ret =hfi_session_set_property (inst, ptype, <r_mark); +if (ret) { +mutex_unlock (&inst->lock); +return ret; + } +break ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES : + ptype =HFI_PROPERTY_CONFIG_VENC_USELTRFRAME ; + ltr_use.ref_ltr = ctrl->val; + ltr_use.use_constrnt = true; + ltr_use.frames =0 ; + ret =hfi_session_set_property (inst, ptype, <r_use); +if (ret) { +mutex_unlock (&inst->lock); +return ret; + } +break ;default :return -EINVAL ; }
@@ -291,7 +326,7 @@ int venc_ctrl_init(struct venus_inst *inst) {int ret; - ret =v4l2_ctrl_handler_init (&inst->ctrl_handler,51 ); + ret =v4l2_ctrl_handler_init (&inst->ctrl_handler,54 );if (ret)return ret;
@@ -498,6 +533,18 @@ int venc_ctrl_init(struct venus_inst *inst)V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID ,0 , 6, 1, 0); +v4l2_ctrl_new_std (&inst->ctrl_handler, &venc_ctrl_ops, +V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES ,0 , + (MAX_LTR_FRAME_COUNT -1 ),1 ,0 ); + +v4l2_ctrl_new_std (&inst->ctrl_handler, &venc_ctrl_ops, +V4L2_CID_MPEG_VIDEO_LTR_COUNT ,0 , +MAX_LTR_FRAME_COUNT ,1 ,0 ); + +v4l2_ctrl_new_std (&inst->ctrl_handler, &venc_ctrl_ops, +V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX ,0 , + (MAX_LTR_FRAME_COUNT -1 ),1 ,0 ); + ret = inst->ctrl_handler.error;if (ret) goto err;
Signature · 1 line
2.7.4