diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-13 19:15:02 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-24 13:03:24 -0400 |
| commit | 5569996421fa1cfc1fc0d9e683ac1def46ea985d (patch) | |
| tree | 552bf2fc87952018f5af8ae3653c535e599ffe90 /drivers/media/video/em28xx/em28xx-video.c | |
| parent | b04fb6615285d18df34ffd6cdd51db7a8a78dda0 (diff) | |
V4L/DVB (12239): em28xx: fix webcam scaling
While trying to fix an mt9v001 webcam, I noticed that HSCALE/VSCALE do
work with em28xx + webcam. The issue is that the scaling setup depends
on the number of visible rows/cols of the input image.
With mt9v011 (Silvercrest), the resolution is 640x480. So, the scaling
is different from a normal TV image (720x480 on NTSC). This were causing
a wrong scaling and a previous patch disabled scaling.
As each sensor have their different resolution setting, the xres/yres
should be adjusted accordingly with the input sensor.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-video.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 89ab2e3b9a2c..ff37b4c15f44 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
| @@ -657,8 +657,8 @@ static void get_scale(struct em28xx *dev, | |||
| 657 | unsigned int width, unsigned int height, | 657 | unsigned int width, unsigned int height, |
| 658 | unsigned int *hscale, unsigned int *vscale) | 658 | unsigned int *hscale, unsigned int *vscale) |
| 659 | { | 659 | { |
| 660 | unsigned int maxw = norm_maxw(dev); | 660 | unsigned int maxw = norm_maxw(dev); |
| 661 | unsigned int maxh = norm_maxh(dev); | 661 | unsigned int maxh = norm_maxh(dev); |
| 662 | 662 | ||
| 663 | *hscale = (((unsigned long)maxw) << 12) / width - 4096L; | 663 | *hscale = (((unsigned long)maxw) << 12) / width - 4096L; |
| 664 | if (*hscale >= 0x4000) | 664 | if (*hscale >= 0x4000) |
| @@ -726,11 +726,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, | |||
| 726 | return -EINVAL; | 726 | return -EINVAL; |
| 727 | } | 727 | } |
| 728 | 728 | ||
| 729 | if (dev->board.is_webcam) { | 729 | if (dev->board.is_em2800) { |
| 730 | /* FIXME: This is the only supported fmt */ | ||
| 731 | width = 640; | ||
| 732 | height = 480; | ||
| 733 | } else if (dev->board.is_em2800) { | ||
| 734 | /* the em2800 can only scale down to 50% */ | 730 | /* the em2800 can only scale down to 50% */ |
| 735 | height = height > (3 * maxh / 4) ? maxh : maxh / 2; | 731 | height = height > (3 * maxh / 4) ? maxh : maxh / 2; |
| 736 | width = width > (3 * maxw / 4) ? maxw : maxw / 2; | 732 | width = width > (3 * maxw / 4) ? maxw : maxw / 2; |
| @@ -767,12 +763,6 @@ static int em28xx_set_video_format(struct em28xx *dev, unsigned int fourcc, | |||
| 767 | { | 763 | { |
| 768 | struct em28xx_fmt *fmt; | 764 | struct em28xx_fmt *fmt; |
| 769 | 765 | ||
| 770 | /* FIXME: This is the only supported fmt */ | ||
| 771 | if (dev->board.is_webcam) { | ||
| 772 | width = 640; | ||
| 773 | height = 480; | ||
| 774 | } | ||
| 775 | |||
| 776 | fmt = format_by_fourcc(fourcc); | 766 | fmt = format_by_fourcc(fourcc); |
| 777 | if (!fmt) | 767 | if (!fmt) |
| 778 | return -EINVAL; | 768 | return -EINVAL; |