iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: s5p-mfc: Add support for UHD encoding.

Browse Source 
MFC driver had restriction on max resolution of 1080p, updated it for
UHD. Added corresponding support to set recommended profile and level
for H264 in UHD scenario.

Cc: linux-fsd@tesla.com
Signed-off-by: Smitha T Murthy <smithatmurthy@gmail.com>
Signed-off-by: Aakarsh Jain <aakarsh.jain@samsung.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
Aakarsh Jain 2023-12-13 13:41:01 +05:30 committed by Hans Verkuil
parent c639899bb6
commit 15fe06f7dc
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
View File

@ -1461,9 +1461,12 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
mfc_err("Unsupported format by this MFC version.\n");
return -EINVAL;
}
v4l_bound_align_image(&pix_fmt_mp->width, 8, 1920, 1,
&pix_fmt_mp->height, 4, 1080, 1, 0);
if (IS_MFCV12(dev))
v4l_bound_align_image(&pix_fmt_mp->width, 8, 3840, 1, &pix_fmt_mp
->height, 4, 2160, 1, 0);
else
v4l_bound_align_image(&pix_fmt_mp->width, 8, 1920, 1, &pix_fmt_mp
->height, 4, 1080, 1, 0);
} else {
mfc_err("invalid buf type\n");
return -EINVAL;

12
drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
View File

@ -1071,6 +1071,18 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx)
reg |= ((p->num_b_frame & 0x3) << 16);
writel(reg, mfc_regs->e_gop_config);
/* UHD encoding case */
if (ctx->img_width == 3840 && ctx->img_height == 2160) {
if (p_h264->level < 51) {
mfc_debug(2, "Set Level 5.1 for UHD\n");
p_h264->level = 51;
}
if (p_h264->profile != 0x2) {
mfc_debug(2, "Set High profile for UHD\n");
p_h264->profile = 0x2;
}
}
/* profile & level */
reg = 0;
/** level */