github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: venus: Enable h.264 hierarchical coding

Browse Source 
HFI supports hierarchical P encoding and the ability to specify the
bitrate for the different layers.

Connect the controls that V4L2 provides and HFI supports.

Signed-off-by: Fritz Koenig <frkoenig@chromium.org>
Reviewed-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
Fritz Koenig 2024-10-22 10:40:43 -07:00 committed by Hans Verkuil
parent 498375e2cb
commit 0e1d123edf
3 changed files with 144 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/qcom/venus/core.h
View File

@ -26,6 +26,7 @@
#define VIDC_CLKS_NUM_MAX 4
#define VIDC_VCODEC_CLKS_NUM_MAX 2
#define VIDC_RESETS_NUM_MAX 2
#define VIDC_MAX_HIER_CODING_LAYER 6
extern int venus_fw_debug;
@ -255,6 +256,7 @@ struct venc_controls {
u32 rc_enable;
u32 const_quality;
u32 frame_skip_mode;
u32 layer_bitrate;
u32 h264_i_period;
u32 h264_entropy_mode;
@ -273,6 +275,8 @@ struct venc_controls {
s32 h264_loop_filter_alpha;
s32 h264_loop_filter_beta;
u32 h264_8x8_transform;
u32 h264_hier_layers;
u32 h264_hier_layer_bitrate[VIDC_MAX_HIER_CODING_LAYER];
u32 hevc_i_qp;
u32 hevc_p_qp;

71
drivers/media/platform/qcom/venus/venc.c
View File

@ -734,6 +734,29 @@ static int venc_set_properties(struct venus_inst *inst)
if (ret)
return ret;
if (ctr->layer_bitrate) {
unsigned int i;
ptype = HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER;
ret = hfi_session_set_property(inst, ptype, &ctr->h264_hier_layers);
if (ret)
return ret;
ptype = HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER;
ret = hfi_session_set_property(inst, ptype, &ctr->layer_bitrate);
if (ret)
return ret;
for (i = 0; i < ctr->h264_hier_layers; ++i) {
ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE;
brate.bitrate = ctr->h264_hier_layer_bitrate[i];
brate.layer_id = i;
ret = hfi_session_set_property(inst, ptype, &brate);
if (ret)
return ret;
}
}
}
if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
@ -823,18 +846,33 @@ static int venc_set_properties(struct venus_inst *inst)
return ret;
}
if (!ctr->bitrate)
bitrate = 64000;
else
bitrate = ctr->bitrate;
if (!ctr->layer_bitrate) {
if (!ctr->bitrate)
bitrate = 64000;
else
bitrate = ctr->bitrate;
ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE;
brate.bitrate = bitrate;
brate.layer_id = 0;
ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE;
brate.bitrate = bitrate;
brate.layer_id = 0;
ret = hfi_session_set_property(inst, ptype, &brate);
if (ret)
return ret;
ret = hfi_session_set_property(inst, ptype, &brate);
if (ret)
return ret;
if (!ctr->bitrate_peak)
bitrate *= 2;
else
bitrate = ctr->bitrate_peak;
ptype = HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE;
brate.bitrate = bitrate;
brate.layer_id = 0;
ret = hfi_session_set_property(inst, ptype, &brate);
if (ret)
return ret;
}
if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
@ -849,19 +887,6 @@ static int venc_set_properties(struct venus_inst *inst)
return ret;
}
if (!ctr->bitrate_peak)
bitrate *= 2;
else
bitrate = ctr->bitrate_peak;
ptype = HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE;
brate.bitrate = bitrate;
brate.layer_id = 0;
ret = hfi_session_set_property(inst, ptype, &brate);
if (ret)
return ret;
ptype = HFI_PROPERTY_PARAM_VENC_SESSION_QP;
if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
quant.qp_i = ctr->hevc_i_qp;

92
drivers/media/platform/qcom/venus/venc_ctrls.c
View File

@ -346,6 +346,55 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
ctr->h264_8x8_transform = ctrl->val;
break;
case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE:
if (ctrl->val != V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P)
return -EINVAL;
break;
case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING:
ctr->layer_bitrate = ctrl->val;
break;
case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER:
if (ctrl->val > VIDC_MAX_HIER_CODING_LAYER)
return -EINVAL;
ctr->h264_hier_layers = ctrl->val;
break;
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR:
ctr->h264_hier_layer_bitrate[0] = ctrl->val;
ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[0], 0);
if (ret)
return ret;
break;
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR:
ctr->h264_hier_layer_bitrate[1] = ctrl->val;
ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[1], 1);
if (ret)
return ret;
break;
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR:
ctr->h264_hier_layer_bitrate[2] = ctrl->val;
ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[2], 2);
if (ret)
return ret;
break;
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR:
ctr->h264_hier_layer_bitrate[3] = ctrl->val;
ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[3], 3);
if (ret)
return ret;
break;
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR:
ctr->h264_hier_layer_bitrate[4] = ctrl->val;
ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[4], 4);
if (ret)
return ret;
break;
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR:
ctr->h264_hier_layer_bitrate[5] = ctrl->val;
ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[5], 5);
if (ret)
return ret;
break;
default:
return -EINVAL;
}
@ -628,6 +677,49 @@ int venc_ctrl_init(struct venus_inst *inst)
V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD, 0,
((4096 * 2304) >> 8), 1, 0);
if (IS_V4(inst->core) || IS_V6(inst->core)) {
v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE,
V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P,
1, V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P);
v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING, 0, 1, 1, 0);
v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER, 0,
VIDC_MAX_HIER_CODING_LAYER, 1, 0);
v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR,
BITRATE_MIN, BITRATE_MAX, BITRATE_STEP, BITRATE_DEFAULT);
v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR,
BITRATE_MIN, BITRATE_MAX,
BITRATE_STEP, BITRATE_DEFAULT);
v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR,
BITRATE_MIN, BITRATE_MAX,
BITRATE_STEP, BITRATE_DEFAULT);
v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR,
BITRATE_MIN, BITRATE_MAX,
BITRATE_STEP, BITRATE_DEFAULT);
v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR,
BITRATE_MIN, BITRATE_MAX,
BITRATE_STEP, BITRATE_DEFAULT);
v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR,
BITRATE_MIN, BITRATE_MAX,
BITRATE_STEP, BITRATE_DEFAULT);
}
ret = inst->ctrl_handler.error;
if (ret)
goto err;