Re: [PATCH v4 17/17] media: mtk-vcodec: venc: fix invalid time per frame in S_PARM

From: Tiffany Lin <tiffany.lin@mediatek.com>
To: Alexandre Courbot <acourbot@chromium.org>
Cc: Andrew-CT Chen <andrew-ct.chen@mediatek.com>,
	Maoguang Meng <maoguang.meng@mediatek.com>,
	devicetree@vger.kernel.org,
	Yunfei Dong <yunfei.dong@mediatek.com>,
	linux-kernel@vger.kernel.org,
	Matthias Brugger <matthias.bgg@gmail.com>,
	linux-mediatek@lists.infradead.org,
	Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	linux-media@vger.kernel.org
Subject: Re: [PATCH v4 17/17] media: mtk-vcodec: venc: fix invalid time per frame in S_PARM
Date: Tue, 25 Aug 2020 13:49:53 +0800	[thread overview]
Message-ID: <1598334593.1969.3.camel@mtksdaap41> (raw)
In-Reply-To: <20200821103608.2310097-18-acourbot@chromium.org>

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@mediatek.com>

> Signed-off-by: Alexandre Courbot <acourbot@chromium.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;

_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek