]>
Commit | Line | Data |
---|---|---|
bed0f502 GKH |
1 | From 1831af092308aa5a59ae61e47494e441c8be6b93 Mon Sep 17 00:00:00 2001 |
2 | From: Javier Martinez Canillas <javierm@redhat.com> | |
3 | Date: Sun, 10 Jun 2018 16:43:02 -0400 | |
4 | Subject: media: Revert "[media] tvp5150: fix pad format frame height" | |
5 | ||
6 | From: Javier Martinez Canillas <javierm@redhat.com> | |
7 | ||
8 | commit 1831af092308aa5a59ae61e47494e441c8be6b93 upstream. | |
9 | ||
10 | This reverts commit 0866df8dffd514185bfab0d205db76e4c02cf1e4. | |
11 | ||
12 | The v4l uAPI documentation [0] makes clear that in the case of interlaced | |
13 | video (i.e: field is V4L2_FIELD_ALTERNATE) the height refers to the number | |
14 | of lines in the field and not the number of lines in the full frame (which | |
15 | is twice the field height for interlaced formats). | |
16 | ||
17 | So the original height calculation was correct, and it shouldn't had been | |
18 | changed by the mentioned commit. | |
19 | ||
20 | [0]:https://linuxtv.org/downloads/v4l-dvb-apis/uapi/v4l/subdev-formats.html | |
21 | ||
22 | Fixes: 0866df8dffd5 ("[media] tvp5150: fix pad format frame height") | |
23 | ||
24 | Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> | |
25 | Cc: <stable@vger.kernel.org> # for v4.12 and up | |
26 | Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> | |
27 | Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | |
28 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
29 | ||
30 | --- | |
31 | drivers/media/i2c/tvp5150.c | 2 +- | |
32 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
33 | ||
34 | --- a/drivers/media/i2c/tvp5150.c | |
35 | +++ b/drivers/media/i2c/tvp5150.c | |
36 | @@ -871,7 +871,7 @@ static int tvp5150_fill_fmt(struct v4l2_ | |
37 | f = &format->format; | |
38 | ||
39 | f->width = decoder->rect.width; | |
40 | - f->height = decoder->rect.height; | |
41 | + f->height = decoder->rect.height / 2; | |
42 | ||
43 | f->code = MEDIA_BUS_FMT_UYVY8_2X8; | |
44 | f->field = V4L2_FIELD_ALTERNATE; |