On 07/03/17 17:48, Jose Abreu wrote:
> HDMI Receivers receive video modes which, according to
> CEA specification, can have different frames per second
> (fps) values.
>
> This patch introduces a helper function in the media core
> which can calculate the expected video mode fps given the
> pixel clock value and the horizontal/vertical values. HDMI
> video receiver drivers are expected to use this helper so
> that they can correctly fill the v4l2_streamparm structure
> which is requested by vidioc_g_parm callback.
>
> We could also use a lookup table for this but it wouldn't
> correctly handle 60Hz vs 59.94Hz situations as this all
> depends on the pixel clock value.
>
> Signed-off-by: Jose Abreu <joabreu@xxxxxxxxxxxx>
> Cc: Carlos Palminha <palminha@xxxxxxxxxxxx>
> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> Cc: Hans Verkuil <hans.verkuil@xxxxxxxxx>
> Cc: Charles-Antoine Couret <charles-antoine.couret@xxxxxxxxxxxx>
> Cc: linux-media@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> ---
> drivers/media/v4l2-core/v4l2-dv-timings.c | 29 +++++++++++++++++++++++++++++
> include/media/v4l2-dv-timings.h | 8 ++++++++
> 2 files changed, 37 insertions(+)
>
> diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c
> index 5c8c49d..19946c6 100644
> --- a/drivers/media/v4l2-core/v4l2-dv-timings.c
> +++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
> @@ -814,3 +814,32 @@ struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait)
> return aspect;
> }
> EXPORT_SYMBOL_GPL(v4l2_calc_aspect_ratio);
> +
> +struct v4l2_fract v4l2_calc_fps(const struct v4l2_dv_timings *t)
> +{
> + const struct v4l2_bt_timings *bt = &t->bt;
> + struct v4l2_fract fps_fract = { 1, 1 };
> + unsigned long n, d;
> + unsigned long mask = GENMASK(BITS_PER_LONG - 1, 0);
This is wrong since v4l2_fract uses u32, and LONG can be 64 bits.
> + u32 htot, vtot, fps;
> + u64 pclk;
> +
> + if (t->type != V4L2_DV_BT_656_1120)
> + return fps_fract;
> +
> + htot = V4L2_DV_BT_FRAME_WIDTH(bt);
> + vtot = V4L2_DV_BT_FRAME_HEIGHT(bt);
> + pclk = bt->pixelclock;
> + if (bt->interlaced)
> + htot /= 2;
This can be dropped. This is the timeperframe, not timeperfield. So for interleaved
formats the time is that of two fields (aka one frame).
> +
> + fps = (htot * vtot) > 0 ? div_u64((100 * pclk), (htot * vtot)) : 0;
> +
> + rational_best_approximation(fps, 100, mask, mask, &n, &d);
I think you can just use fps, 100 instead of mask, mask.
What is returned if fps == 0?
I don't have a problem as such with this function, but just be aware that the
pixelclock is never precise: there are HDMI receivers that are unable to report
the pixelclock with enough precision to even detect if it is 60 vs 59.94 Hz.
And even for those that can, it is often not reliable.
In order for me to merge this it also should be used in a driver. Actually the
cobalt and vivid drivers would be suitable: you can test the vivid driver yourself,
and if you have a patch for the cobalt driver, then I can test that for you.
Would be nice for the cobalt driver, since g_parm always returns 60 fps :-)
Regards,
Hans
> +
> + fps_fract.numerator = d;
> + fps_fract.denominator = n;
> + return fps_fract;
> +}
> +EXPORT_SYMBOL_GPL(v4l2_calc_fps);
> +
> diff --git a/include/media/v4l2-dv-timings.h b/include/media/v4l2-dv-timings.h
> index 61a1889..d23b168 100644
> --- a/include/media/v4l2-dv-timings.h
> +++ b/include/media/v4l2-dv-timings.h
> @@ -196,6 +196,14 @@ bool v4l2_detect_gtf(unsigned frame_height, unsigned hfreq, unsigned vsync,
> struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait);
>
> /**
> + * v4l2_calc_fps - calculate the frames per seconds based on the
> + * v4l2_dv_timings information.
> + *
> + * @t: the timings data.
> + */
> +struct v4l2_fract v4l2_calc_fps(const struct v4l2_dv_timings *t);
> +
> +/**
> * v4l2_dv_timings_aspect_ratio - calculate the aspect ratio based on the
> * v4l2_dv_timings information.
> *
>
