[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4588c8d9-7c0b-a3da-fa8b-c5de69d735e4@quicinc.com>
Date: Mon, 16 Jun 2025 16:54:33 +0530
From: Vikash Garodia <quic_vgarodia@...cinc.com>
To: Ricardo Ribalda <ribalda@...omium.org>,
Mauro Carvalho Chehab
<mchehab@...nel.org>,
Stanimir Varbanov <stanimir.k.varbanov@...il.com>,
Bryan O'Donoghue <bryan.odonoghue@...aro.org>,
Hans Verkuil
<hverkuil@...all.nl>
CC: <linux-media@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-arm-msm@...r.kernel.org>
Subject: Re: [PATCH v6 4/6] media: venus: Remove timeperframe from inst
On 1/11/2025 3:25 PM, Ricardo Ribalda wrote:
> The driver only cares about whole fps. We can infer the timeperframe
> from the fps field. Remove the redundant field.
>
> Signed-off-by: Ricardo Ribalda <ribalda@...omium.org>
> ---
> drivers/media/platform/qcom/venus/core.h | 2 --
> drivers/media/platform/qcom/venus/vdec.c | 15 ++++++++-------
> drivers/media/platform/qcom/venus/venc.c | 16 ++++++++--------
> 3 files changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> index afae2b9fdaf7..1d4fd5cc75d9 100644
> --- a/drivers/media/platform/qcom/venus/core.h
> +++ b/drivers/media/platform/qcom/venus/core.h
> @@ -407,7 +407,6 @@ enum venus_inst_modes {
> * @tss: timestamp metadata
> * @payloads: cache plane payload to use it for clock/BW scaling
> * @fps: holds current FPS
> - * @timeperframe: holds current time per frame structure
> * @fmt_out: a reference to output format structure
> * @fmt_cap: a reference to capture format structure
> * @num_input_bufs: holds number of input buffers
> @@ -478,7 +477,6 @@ struct venus_inst {
> struct venus_ts_metadata tss[VIDEO_MAX_FRAME];
> unsigned long payloads[VIDEO_MAX_FRAME];
> u64 fps;
> - struct v4l2_fract timeperframe;
> const struct venus_format *fmt_out;
> const struct venus_format *fmt_cap;
> unsigned int num_input_bufs;
> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
> index c1d5f94e16b4..e160a5508154 100644
> --- a/drivers/media/platform/qcom/venus/vdec.c
> +++ b/drivers/media/platform/qcom/venus/vdec.c
> @@ -471,10 +471,12 @@ static int vdec_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
> return -EINVAL;
>
> memset(cap->reserved, 0, sizeof(cap->reserved));
> - if (!timeperframe->denominator)
> - timeperframe->denominator = inst->timeperframe.denominator;
> - if (!timeperframe->numerator)
> - timeperframe->numerator = inst->timeperframe.numerator;
> +
> + if (!timeperframe->numerator || !timeperframe->denominator) {
> + timeperframe->numerator = 1;
> + timeperframe->denominator = inst->fps;
> + }
> +
> cap->readbuffers = 0;
> cap->extendedmode = 0;
> cap->capability = V4L2_CAP_TIMEPERFRAME;
> @@ -487,7 +489,8 @@ static int vdec_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
> fps = min(VENUS_MAX_FPS, fps);
>
> inst->fps = fps;
> - inst->timeperframe = *timeperframe;
> + timeperframe->numerator = 1;
> + timeperframe->denominator = inst->fps;
>
> return 0;
> }
> @@ -1612,8 +1615,6 @@ static void vdec_inst_init(struct venus_inst *inst)
> inst->out_width = frame_width_min(inst);
> inst->out_height = frame_height_min(inst);
> inst->fps = 30;
> - inst->timeperframe.numerator = 1;
> - inst->timeperframe.denominator = 30;
> inst->opb_buftype = HFI_BUFFER_OUTPUT;
> }
>
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index 943d432b6568..17bec44c9825 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -401,10 +401,10 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
>
> memset(out->reserved, 0, sizeof(out->reserved));
>
> - if (!timeperframe->denominator)
> - timeperframe->denominator = inst->timeperframe.denominator;
> - if (!timeperframe->numerator)
> - timeperframe->numerator = inst->timeperframe.numerator;
> + if (!timeperframe->numerator || !timeperframe->denominator) {
> + timeperframe->numerator = 1;
> + timeperframe->denominator = inst->fps;
> + }
>
> out->capability = V4L2_CAP_TIMEPERFRAME;
>
> @@ -416,8 +416,9 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
> do_div(fps, us_per_frame);
> fps = min(VENUS_MAX_FPS, fps);
>
> - inst->timeperframe = *timeperframe;
> inst->fps = fps;
> + timeperframe->numerator = 1;
> + timeperframe->denominator = inst->fps;
>
> return 0;
> }
> @@ -431,7 +432,8 @@ static int venc_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
> return -EINVAL;
>
> a->parm.output.capability |= V4L2_CAP_TIMEPERFRAME;
> - a->parm.output.timeperframe = inst->timeperframe;
> + a->parm.output.timeperframe.numerator = 1;
> + a->parm.output.timeperframe.denominator = inst->fps;
>
> return 0;
> }
> @@ -1454,8 +1456,6 @@ static void venc_inst_init(struct venus_inst *inst)
> inst->out_width = 1280;
> inst->out_height = 720;
> inst->fps = 15;
> - inst->timeperframe.numerator = 1;
> - inst->timeperframe.denominator = 15;
> inst->hfi_codec = HFI_VIDEO_CODEC_H264;
> }
>
>
Reviewed-by: Vikash Garodia <quic_vgarodia@...cinc.com>
Powered by blists - more mailing lists