lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 25 Aug 2020 13:49:53 +0800 From: Tiffany Lin <tiffany.lin@...iatek.com> To: Alexandre Courbot <acourbot@...omium.org> CC: Andrew-CT Chen <andrew-ct.chen@...iatek.com>, Hans Verkuil <hverkuil-cisco@...all.nl>, Yunfei Dong <yunfei.dong@...iatek.com>, Maoguang Meng <maoguang.meng@...iatek.com>, Matthias Brugger <matthias.bgg@...il.com>, <linux-media@...r.kernel.org>, <linux-mediatek@...ts.infradead.org>, <devicetree@...r.kernel.org>, <linux-kernel@...r.kernel.org> Subject: Re: [PATCH v4 17/17] media: mtk-vcodec: venc: fix invalid time per frame in S_PARM On Fri, 2020-08-21 at 19:36 +0900, Alexandre Courbot wrote: > v4l2-compliance expects the driver to adjust the time per frame if it is > invalid (numerator or denominator set to 0). Adjust it to the default > value in these cases. > Acked-by: Tiffany Lin <tiffany.lin@...iatek.com> > Signed-off-by: Alexandre Courbot <acourbot@...omium.org> > --- > drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > index 09baac2dbc36..82b04714f750 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > @@ -200,14 +200,18 @@ static int vidioc_venc_s_parm(struct file *file, void *priv, > struct v4l2_streamparm *a) > { > struct mtk_vcodec_ctx *ctx = fh_to_ctx(priv); > + struct v4l2_fract *timeperframe = &a->parm.output.timeperframe; > > if (a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) > return -EINVAL; > > - ctx->enc_params.framerate_num = > - a->parm.output.timeperframe.denominator; > - ctx->enc_params.framerate_denom = > - a->parm.output.timeperframe.numerator; > + if (timeperframe->numerator == 0 || timeperframe->denominator == 0) { > + timeperframe->numerator = MTK_DEFAULT_FRAMERATE_NUM; > + timeperframe->denominator = MTK_DEFAULT_FRAMERATE_DENOM; > + } > + > + ctx->enc_params.framerate_num = timeperframe->denominator; > + ctx->enc_params.framerate_denom = timeperframe->numerator; > ctx->param_change |= MTK_ENCODE_PARAM_FRAMERATE; > > a->parm.output.capability = V4L2_CAP_TIMEPERFRAME;
Powered by blists - more mailing lists