venus: venc: add support for V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM control
Subsystems (4)
PATCH v2 1/1 venus: venc: add support for V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM control
Add support for V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM control for H264 high profile and constrained high profile.
--- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/hfi_cmds.c | 8 ++++++++ drivers/media/platform/qcom/venus/hfi_helper.h | 5 +++++ drivers/media/platform/qcom/venus/venc.c | 11 +++++++++++ drivers/media/platform/qcom/venus/venc_ctrls.c | 15 ++++++++++++++- 5 files changed, 39 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/venus/core.h +1 -0
@@ -234,6 +234,7 @@ struct venc_controls {u32 h264_loop_filter_mode;s32 h264_loop_filter_alpha;s32 h264_loop_filter_beta; +u32 h264_8x8_transform;u32 hevc_i_qp;u32 hevc_p_qp;
drivers/media/platform/qcom/venus/hfi_cmds.c +8 -0
@@ -1239,6 +1239,14 @@ pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt,break ; } +case HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8 : { +struct hfi_h264_8x8x_transform *in = pdata, *tm = prop_data; + + tm->enable_type = in->enable_type; + pkt->shdr.hdr.size +=sizeof (u32) +sizeof (*tm); +break ; + } +case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE :case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER :case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE :
drivers/media/platform/qcom/venus/hfi_helper.h +5 -0
@@ -507,6 +507,7 @@#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020#define HFI_PROPERTY_PARAM_VENC_H264_VUI_BITSTREAM_RESTRC 0x2005021#define HFI_PROPERTY_PARAM_VENC_PRESERVE_TEXT_QUALITY 0x2005023 +#define HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8 0x2005025#define HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER 0x2005026#define HFI_PROPERTY_PARAM_VENC_DISABLE_RC_TIMESTAMP 0x2005027#define HFI_PROPERTY_PARAM_VENC_INITIAL_QP 0x2005028
@@ -562,6 +563,10 @@ struct hfi_bitrate {u32 layer_id; }; +struct hfi_h264_8x8x_transform { +u32 enable_type; +}; +#define HFI_CAPABILITY_FRAME_WIDTH 0x01#define HFI_CAPABILITY_FRAME_HEIGHT 0x02#define HFI_CAPABILITY_MBS_PER_FRAME 0x03
drivers/media/platform/qcom/venus/venc.c +11 -0
@@ -567,6 +567,7 @@ static int venc_set_properties(struct venus_inst *inst)struct hfi_h264_vui_timing_info info;struct hfi_h264_entropy_control entropy;struct hfi_h264_db_control deblock; +struct hfi_h264_8x8x_transform h264_transform; ptype =HFI_PROPERTY_PARAM_VENC_H264_VUI_TIMING_INFO ; info.enable =1 ;
@@ -597,6 +598,16 @@ static int venc_set_properties(struct venus_inst *inst) ret =hfi_session_set_property (inst, ptype, &deblock);if (ret)return ret; + + ptype =HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8 ; +if (ctr->profile.h264 ==HFI_H264_PROFILE_HIGH || + ctr->profile.h264 ==HFI_H264_PROFILE_CONSTRAINED_HIGH ) + h264_transform.enable_type = ctr->h264_8x8_transform; + + ret =hfi_session_set_property (inst, ptype, &h264_transform); +if (ret) +return ret; + } if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
drivers/media/platform/qcom/venus/venc_ctrls.c +14 -1
@@ -319,6 +319,16 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY : ctr->mastering = *ctrl->p_new.p_hdr10_mastering;break ; +case V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM : +if (ctr->profile.h264 !=HFI_H264_PROFILE_HIGH && + ctr->profile.h264 !=HFI_H264_PROFILE_CONSTRAINED_HIGH ) +return -EINVAL ; + +if (ctrl->val ==0 ) +return -EINVAL ; + + ctr->h264_8x8_transform = ctrl->val; +break ;default :return -EINVAL ; }
@@ -334,7 +344,7 @@ int venc_ctrl_init(struct venus_inst *inst) {int ret; - ret =v4l2_ctrl_handler_init (&inst->ctrl_handler,57 ); + ret =v4l2_ctrl_handler_init (&inst->ctrl_handler,58 );if (ret)return ret;
@@ -438,6 +448,9 @@ int venc_ctrl_init(struct venus_inst *inst) V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP, 1, 51, 1, 1);v4l2_ctrl_new_std (&inst->ctrl_handler, &venc_ctrl_ops, +V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM ,0 ,1 ,1 ,0 ); + +v4l2_ctrl_new_std (&inst->ctrl_handler, &venc_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP ,1 ,51 ,1 ,1 ); v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 56 lines · Mansur Alisha Shaik
Add support for
V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORMcontrol for H264 high profile and constrained high profile.Signed-off-by Mansur Alisha Shaik <[email protected]>--- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/hfi_cmds.c | 8 ++++++++ drivers/media/platform/qcom/venus/hfi_helper.h | 5 +++++ drivers/media/platform/qcom/venus/venc.c | 11 +++++++++++ drivers/media/platform/qcom/venus/venc_ctrls.c | 15 ++++++++++++++- 5 files changed, 39 insertions(+), 1 deletion(-)drivers/media/platform/qcom/venus/core.h +1
-0@@ -234,6 +234,7 @@ struct venc_controls {u32 h264_loop_filter_mode;s32 h264_loop_filter_alpha;s32 h264_loop_filter_beta; +u32 h264_8x8_transform;u32 hevc_i_qp;u32 hevc_p_qp;drivers/media/platform/qcom/venus/hfi_cmds.c +8
-0@@ -1239,6 +1239,14 @@ pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt,break ; } +case HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8 : { +struct hfi_h264_8x8x_transform *in = pdata, *tm = prop_data; + + tm->enable_type = in->enable_type; + pkt->shdr.hdr.size +=sizeof (u32) +sizeof (*tm); +break ; + } +case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE :case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER :case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE :drivers/media/platform/qcom/venus/hfi_helper.h +1
-0@@ -507,6 +507,7 @@#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020#define HFI_PROPERTY_PARAM_VENC_H264_VUI_BITSTREAM_RESTRC 0x2005021#define HFI_PROPERTY_PARAM_VENC_PRESERVE_TEXT_QUALITY 0x2005023 +#define HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8 0x2005025#define HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER 0x2005026#define HFI_PROPERTY_PARAM_VENC_DISABLE_RC_TIMESTAMP 0x2005027#define HFI_PROPERTY_PARAM_VENC_INITIAL_QP 0x2005028
drivers/media/platform/qcom/venus/hfi_helper.h struct hfi_bitrate { · line 566
Quoted 4 lines
drivers/media/platform/qcom/venus/hfi_helper.h +1
-0@@ -562,6 +563,10 @@ struct hfi_bitrate {u32 layer_id; }; +struct hfi_h264_8x8x_transform {
s/hfi_h264_8x8x_transform/hfi_h264_8x8_transform
Quoted 19 lines
drivers/media/platform/qcom/venus/hfi_helper.h +3
-0+u32 enable_type; +}; +#define HFI_CAPABILITY_FRAME_WIDTH 0x01#define HFI_CAPABILITY_FRAME_HEIGHT 0x02#define HFI_CAPABILITY_MBS_PER_FRAME 0x03drivers/media/platform/qcom/venus/venc.c +1
-0@@ -567,6 +567,7 @@ static int venc_set_properties(struct venus_inst *inst)struct hfi_h264_vui_timing_info info;struct hfi_h264_entropy_control entropy;struct hfi_h264_db_control deblock; +struct hfi_h264_8x8x_transform h264_transform; ptype =HFI_PROPERTY_PARAM_VENC_H264_VUI_TIMING_INFO ; info.enable =1 ;
drivers/media/platform/qcom/venus/venc.c static int venc_set_properties(struct venus_inst *inst) · line 607
Quoted 10 lines
drivers/media/platform/qcom/venus/venc.c +7
-0@@ -597,6 +598,16 @@ static int venc_set_properties(struct venus_inst *inst) ret =hfi_session_set_property (inst, ptype, &deblock);if (ret)return ret; + + ptype =HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8 ; +if (ctr->profile.h264 ==HFI_H264_PROFILE_HIGH || + ctr->profile.h264 ==HFI_H264_PROFILE_CONSTRAINED_HIGH ) + h264_transform.enable_type = ctr->h264_8x8_transform; + + ret =hfi_session_set_property (inst, ptype, &h264_transform);
h264_transform.enable_type is undefined for other profiles different from HIGH and CONSTRAINED_HIGH.
Quoted 11 lines
drivers/media/platform/qcom/venus/venc.c +3
-0+if (ret) +return ret; + } if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||drivers/media/platform/qcom/venus/venc_ctrls.c +0
-0
drivers/media/platform/qcom/venus/venc_ctrls.c static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) · line 328
Quoted 10 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +7
-0@@ -319,6 +319,16 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY : ctr->mastering = *ctrl->p_new.p_hdr10_mastering;break ; +case V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM : +if (ctr->profile.h264 !=HFI_H264_PROFILE_HIGH && + ctr->profile.h264 !=HFI_H264_PROFILE_CONSTRAINED_HIGH ) +return -EINVAL ; + +if (ctrl->val ==0 ) +return -EINVAL ;
Can you add a comment why 8x8 transform cannot be disabled for HIGH and CONSTRAINED_HIGH profiles.
Quoted 26 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +7
-1+ + ctr->h264_8x8_transform = ctrl->val; +break ;default :return -EINVAL ; }@@ -334,7 +344,7 @@ int venc_ctrl_init(struct venus_inst *inst) {int ret; - ret =v4l2_ctrl_handler_init (&inst->ctrl_handler,57 ); + ret =v4l2_ctrl_handler_init (&inst->ctrl_handler,58 );if (ret)return ret;@@ -438,6 +448,9 @@ int venc_ctrl_init(struct venus_inst *inst) V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP, 1, 51, 1, 1);v4l2_ctrl_new_std (&inst->ctrl_handler, &venc_ctrl_ops, +V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM ,0 ,1 ,1 ,0 ); + +v4l2_ctrl_new_std (&inst->ctrl_handler, &venc_ctrl_ops,V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP ,1 ,51 ,1 ,1 ); v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
Signature · 2 lines
regards, Stan