diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-13 20:15:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-24 14:03:24 -0300 |
| commit | 5569996421fa1cfc1fc0d9e683ac1def46ea985d (patch) | |
| tree | 552bf2fc87952018f5af8ae3653c535e599ffe90 /drivers/media/video/em28xx/em28xx-core.c | |
| parent | b04fb6615285d18df34ffd6cdd51db7a8a78dda0 (diff) | |
| download | kernel_samsung_smdk4412-5569996421fa1cfc1fc0d9e683ac1def46ea985d.zip kernel_samsung_smdk4412-5569996421fa1cfc1fc0d9e683ac1def46ea985d.tar.gz kernel_samsung_smdk4412-5569996421fa1cfc1fc0d9e683ac1def46ea985d.tar.bz2 | |
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-core.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 8649bdb..c7fcce7 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c @@ -707,10 +707,7 @@ static int em28xx_scaler_set(struct em28xx *dev, u16 h, u16 v) u8 mode; /* the em2800 scaler only supports scaling down to 50% */ - if (dev->board.is_webcam) { - /* FIXME: Don't use the scaler yet */ - mode = 0; - } else if (dev->board.is_em2800) { + if (dev->board.is_em2800) { mode = (v ? 0x20 : 0x00) | (h ? 0x10 : 0x00); } else { u8 buf[2]; |