* [PATCH v3 2/2] vivid: add support to set CVT, GTF timings
@ 2015-03-20 17:20 Prashant Laddha
2015-03-20 17:34 ` Hans Verkuil
0 siblings, 1 reply; 2+ messages in thread
From: Prashant Laddha @ 2015-03-20 17:20 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil, Prashant Laddha
In addition to v4l2_find_dv_timings_cap(), where timings are searched
against the list of preset timings, the incoming timing from v4l2-ctl
is checked against CVT and GTF standards. If it confirms to be CVT or
GTF, it is treated as valid timing and vivid format is updated with
new timings.
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Prashant Laddha <prladdha@cisco.com>
v3: detect timings even when bt->standards == 0
(Thanks to Hans for spotting this error)
---
drivers/media/platform/vivid/vivid-vid-cap.c | 61 +++++++++++++++++++++++++++-
1 file changed, 60 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
index 867a29a..47077cf 100644
--- a/drivers/media/platform/vivid/vivid-vid-cap.c
+++ b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -1552,6 +1552,63 @@ int vivid_vid_cap_s_std(struct file *file, void *priv, v4l2_std_id id)
return 0;
}
+static void find_aspect_ratio(u32 width, u32 height,
+ u32 *num, u32 *denom)
+{
+ if (!(height % 3) && ((height * 4 / 3) == width)) {
+ *num = 4;
+ *denom = 3;
+ } else if (!(height % 9) && ((height * 16 / 9) == width)) {
+ *num = 16;
+ *denom = 9;
+ } else if (!(height % 10) && ((height * 16 / 10) == width)) {
+ *num = 16;
+ *denom = 10;
+ } else if (!(height % 4) && ((height * 5 / 4) == width)) {
+ *num = 5;
+ *denom = 4;
+ } else if (!(height % 9) && ((height * 15 / 9) == width)) {
+ *num = 15;
+ *denom = 9;
+ } else { /* default to 16:9 */
+ *num = 16;
+ *denom = 9;
+ }
+}
+
+static bool valid_cvt_gtf_timings(struct v4l2_dv_timings *timings)
+{
+ struct v4l2_bt_timings *bt = &timings->bt;
+ u32 total_h_pixel;
+ u32 total_v_lines;
+ u32 h_freq;
+
+ if (!v4l2_valid_dv_timings(timings, &vivid_dv_timings_cap,
+ NULL, NULL))
+ return false;
+
+ total_h_pixel = V4L2_DV_BT_FRAME_WIDTH(bt);
+ total_v_lines = V4L2_DV_BT_FRAME_HEIGHT(bt);
+
+ h_freq = (u32)bt->pixelclock / total_h_pixel;
+
+ if (bt->standard == 0 || (bt->standards == V4L2_DV_BT_STD_CVT))
+ return v4l2_detect_cvt(total_v_lines, h_freq, bt->vsync,
+ bt->polarities, timings);
+
+ if (bt->standard == 0 || (bt->standards == V4L2_DV_BT_STD_GTF)) {
+ struct v4l2_fract aspect_ratio;
+
+ find_aspect_ratio(bt->width, bt->height,
+ &aspect_ratio.numerator,
+ &aspect_ratio.denominator);
+ return v4l2_detect_gtf(total_v_lines, h_freq, bt->vsync,
+ bt->polarities, aspect_ratio, timings);
+ }
+
+ return false;
+}
+
int vivid_vid_cap_s_dv_timings(struct file *file, void *_fh,
struct v4l2_dv_timings *timings)
{
@@ -1561,8 +1618,10 @@ int vivid_vid_cap_s_dv_timings(struct file *file, void *_fh,
return -ENODATA;
if (vb2_is_busy(&dev->vb_vid_cap_q))
return -EBUSY;
+
if (!v4l2_find_dv_timings_cap(timings, &vivid_dv_timings_cap,
- 0, NULL, NULL))
+ 0, NULL, NULL)
+ && !valid_cvt_gtf_timings(timings))
return -EINVAL;
if (v4l2_match_dv_timings(timings, &dev->dv_timings_cap, 0))
return 0;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3 2/2] vivid: add support to set CVT, GTF timings
2015-03-20 17:20 [PATCH v3 2/2] vivid: add support to set CVT, GTF timings Prashant Laddha
@ 2015-03-20 17:34 ` Hans Verkuil
0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2015-03-20 17:34 UTC (permalink / raw)
To: Prashant Laddha, linux-media; +Cc: Hans Verkuil
On 03/20/2015 06:20 PM, Prashant Laddha wrote:
> In addition to v4l2_find_dv_timings_cap(), where timings are searched
> against the list of preset timings, the incoming timing from v4l2-ctl
> is checked against CVT and GTF standards. If it confirms to be CVT or
> GTF, it is treated as valid timing and vivid format is updated with
> new timings.
>
> Cc: Hans Verkuil <hans.verkuil@cisco.com>
> Signed-off-by: Prashant Laddha <prladdha@cisco.com>
>
> v3: detect timings even when bt->standards == 0
> (Thanks to Hans for spotting this error)
> ---
> drivers/media/platform/vivid/vivid-vid-cap.c | 61 +++++++++++++++++++++++++++-
> 1 file changed, 60 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
> index 867a29a..47077cf 100644
> --- a/drivers/media/platform/vivid/vivid-vid-cap.c
> +++ b/drivers/media/platform/vivid/vivid-vid-cap.c
> @@ -1552,6 +1552,63 @@ int vivid_vid_cap_s_std(struct file *file, void *priv, v4l2_std_id id)
> return 0;
> }
>
> +static void find_aspect_ratio(u32 width, u32 height,
> + u32 *num, u32 *denom)
> +{
> + if (!(height % 3) && ((height * 4 / 3) == width)) {
> + *num = 4;
> + *denom = 3;
> + } else if (!(height % 9) && ((height * 16 / 9) == width)) {
> + *num = 16;
> + *denom = 9;
> + } else if (!(height % 10) && ((height * 16 / 10) == width)) {
> + *num = 16;
> + *denom = 10;
> + } else if (!(height % 4) && ((height * 5 / 4) == width)) {
> + *num = 5;
> + *denom = 4;
> + } else if (!(height % 9) && ((height * 15 / 9) == width)) {
> + *num = 15;
> + *denom = 9;
> + } else { /* default to 16:9 */
> + *num = 16;
> + *denom = 9;
> + }
> +}
> +
> +static bool valid_cvt_gtf_timings(struct v4l2_dv_timings *timings)
> +{
> + struct v4l2_bt_timings *bt = &timings->bt;
> + u32 total_h_pixel;
> + u32 total_v_lines;
> + u32 h_freq;
> +
> + if (!v4l2_valid_dv_timings(timings, &vivid_dv_timings_cap,
> + NULL, NULL))
> + return false;
> +
> + total_h_pixel = V4L2_DV_BT_FRAME_WIDTH(bt);
> + total_v_lines = V4L2_DV_BT_FRAME_HEIGHT(bt);
> +
> + h_freq = (u32)bt->pixelclock / total_h_pixel;
> +
> + if (bt->standard == 0 || (bt->standards == V4L2_DV_BT_STD_CVT))
> + return v4l2_detect_cvt(total_v_lines, h_freq, bt->vsync,
> + bt->polarities, timings);
You didn't read my review comments carefully enough :-)
Use '&' instead of '==', and only return if v4l2_detect_cvt() returns true,
otherwise just continue to see if you need to test for GTF.
Regards,
Hans
> +
> + if (bt->standard == 0 || (bt->standards == V4L2_DV_BT_STD_GTF)) {
> + struct v4l2_fract aspect_ratio;
> +
> + find_aspect_ratio(bt->width, bt->height,
> + &aspect_ratio.numerator,
> + &aspect_ratio.denominator);
> + return v4l2_detect_gtf(total_v_lines, h_freq, bt->vsync,
> + bt->polarities, aspect_ratio, timings);
> + }
> +
> + return false;
> +}
> +
> int vivid_vid_cap_s_dv_timings(struct file *file, void *_fh,
> struct v4l2_dv_timings *timings)
> {
> @@ -1561,8 +1618,10 @@ int vivid_vid_cap_s_dv_timings(struct file *file, void *_fh,
> return -ENODATA;
> if (vb2_is_busy(&dev->vb_vid_cap_q))
> return -EBUSY;
> +
> if (!v4l2_find_dv_timings_cap(timings, &vivid_dv_timings_cap,
> - 0, NULL, NULL))
> + 0, NULL, NULL)
> + && !valid_cvt_gtf_timings(timings))
> return -EINVAL;
> if (v4l2_match_dv_timings(timings, &dev->dv_timings_cap, 0))
> return 0;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-20 17:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-20 17:20 [PATCH v3 2/2] vivid: add support to set CVT, GTF timings Prashant Laddha
2015-03-20 17:34 ` Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).