Revert "V4L/DVB (11906): saa7134: Use v4l bounding/alignment function"
authorHerton Ronaldo Krzesinski <herton@mandriva.com.br>
Fri, 19 Mar 2010 17:58:23 +0000 (14:58 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 19 May 2010 15:57:13 +0000 (12:57 -0300)
commit0a062033f727dc041691bfd768f4cf0598f559a1
tree8d909009ef123050590054de96458c4706a7c7c4
parent2b0691cfc714a0f4dff582c913de1a3a68cb38a7
Revert "V4L/DVB (11906): saa7134: Use v4l bounding/alignment function"

This reverts commit bc52d6eb44de8f19934768d4d10d19fdbdc99950.

On newer kernels, a saa7134 board stopped to display TV video output
properly. After a bisect, I found it as the commit causing the issue.
Turns out that v4l_bound_align_image isn't doing the same bounding
calculation as manually done previously in saa7134_try_fmt_vid_cap.

What isn't equal is the calculation done in clamp align, while
previously it did "f->fmt.pix.width &= ~0x03", clamp_align function
does "Round to nearest aligned value" as stated in the comment, which
yields a different result. If I comment the round calculation in
clamp_align like this: "x = (x /*+ (1 << (align - 1))*/) & mask",
I get it fixed too, because this way the calculation is the same then.

Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/saa7134/saa7134-video.c