UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: venus: venc: Add support for AUD NALU control 

Add support for Access Unit Delimiter control into encoder.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Stanimir Varbanov 2020-11-24 01:40:12 +01:00 committed by Mauro Carvalho Chehab
parent f2bf1bcb19
commit 08c0679762
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,7 @@ struct venc_controls {
u32 multi_slice_max_mb;
u32 header_mode;
bool aud_enable;
struct {
u32 h264;

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

@ -754,6 +754,20 @@ static int venc_set_properties(struct venus_inst *inst)
if (ret)
return ret;
if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
struct hfi_enable en = {};
ptype = HFI_PROPERTY_PARAM_VENC_H264_GENERATE_AUDNAL;
if (ctr->aud_enable)
en.enable = 1;
ret = hfi_session_set_property(inst, ptype, &en);
if (ret)
return ret;
}
return 0;
}

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

@ -276,6 +276,9 @@ 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_AU_DELIMITER:
ctr->aud_enable = ctrl->val;
break;
default:
return -EINVAL;
}
@ -291,7 +294,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, 52);
if (ret)
return ret;
@ -498,6 +501,9 @@ 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_AU_DELIMITER, 0, 1, 1, 0);
ret = inst->ctrl_handler.error;
if (ret)
goto err;