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

media: mtk-vcodec: venc: use platform data for ENUM_FRAMESIZES

Browse Source 
vidioc_enum_framesizes() assumes that all encoders support H.264 and VP8,
which is not necessarily true and requires to duplicate information about
the supported codecs which is already stored in the platform data.

Fix this by referring to the platform data to find out whether a given
format is supported. Since the supported sizes are all the same
regardless of the format, we can then return a copy of a static value if
the format is supported.

Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Alexandre Courbot 2020-08-21 12:36:05 +02:00 committed by Mauro Carvalho Chehab
parent 327296920f
commit cd38551152
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
View File

@ -26,17 +26,9 @@
static void mtk_venc_worker(struct work_struct *work);
static const struct mtk_codec_framesizes mtk_venc_framesizes[] = {
{
.fourcc = V4L2_PIX_FMT_H264,
.stepwise = { MTK_VENC_MIN_W, MTK_VENC_MAX_W, 16,
MTK_VENC_MIN_H, MTK_VENC_MAX_H, 16 },
},
{
.fourcc = V4L2_PIX_FMT_VP8,
.stepwise = { MTK_VENC_MIN_W, MTK_VENC_MAX_W, 16,
MTK_VENC_MIN_H, MTK_VENC_MAX_H, 16 },
},
static const struct v4l2_frmsize_stepwise mtk_venc_framesizes = {
MTK_VENC_MIN_W, MTK_VENC_MAX_W, 16,
MTK_VENC_MIN_H, MTK_VENC_MAX_H, 16,
};
#define NUM_SUPPORTED_FRAMESIZE ARRAY_SIZE(mtk_venc_framesizes)
@ -134,17 +126,21 @@ static int vidioc_enum_fmt(struct v4l2_fmtdesc *f,
static int vidioc_enum_framesizes(struct file *file, void *fh,
struct v4l2_frmsizeenum *fsize)
{
const struct mtk_vcodec_enc_pdata *pdata =
fh_to_ctx(fh)->dev->venc_pdata;
int i = 0;
if (fsize->index != 0)
return -EINVAL;
for (i = 0; i < NUM_SUPPORTED_FRAMESIZE; ++i) {
if (fsize->pixel_format != mtk_venc_framesizes[i].fourcc)
for (i = 0; i < pdata->num_capture_formats; ++i) {
const struct mtk_video_fmt *fmt = &pdata->capture_formats[i];
if (fsize->pixel_format != fmt->fourcc)
continue;
fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
fsize->stepwise = mtk_venc_framesizes[i].stepwise;
fsize->stepwise = mtk_venc_framesizes;
return 0;
}