Commit 1831af09 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab

media: Revert "[media] tvp5150: fix pad format frame height"

This reverts commit 0866df8d.

The v4l uAPI documentation [0] makes clear that in the case of interlaced
video (i.e: field is V4L2_FIELD_ALTERNATE) the height refers to the number
of lines in the field and not the number of lines in the full frame (which
is twice the field height for interlaced formats).

So the original height calculation was correct, and it shouldn't had been
changed by the mentioned commit.

[0]:https://linuxtv.org/downloads/v4l-dvb-apis/uapi/v4l/subdev-formats.html

Fixes: 0866df8d ("[media] tvp5150: fix pad format frame height")
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Cc: <stable@vger.kernel.org>      # for v4.12 and up
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent aed19754
...@@ -872,7 +872,7 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd, ...@@ -872,7 +872,7 @@ static int tvp5150_fill_fmt(struct v4l2_subdev *sd,
f = &format->format; f = &format->format;
f->width = decoder->rect.width; f->width = decoder->rect.width;
f->height = decoder->rect.height; f->height = decoder->rect.height / 2;
f->code = MEDIA_BUS_FMT_UYVY8_2X8; f->code = MEDIA_BUS_FMT_UYVY8_2X8;
f->field = V4L2_FIELD_ALTERNATE; f->field = V4L2_FIELD_ALTERNATE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment