diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-core.c')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-core.c | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index ba2d986c6dfc..263b6c91adb5 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c @@ -430,30 +430,22 @@ int em2820_capture_area_set(struct em2820 *dev, u8 hstart, u8 vstart, int em2820_scaler_set(struct em2820 *dev, u16 h, u16 v) { - u8 buf[2]; - buf[0] = h; - buf[1] = h >> 8; - em2820_write_regs(dev, HSCALELOW_REG, (char *)buf, 2); - buf[0] = v; - buf[1] = v >> 8; - em2820_write_regs(dev, VSCALELOW_REG, (char *)buf, 2); - if(dev->is_em2800){ - /* FIXME */ - /* random ratio scaling and 720x567 doesn't seem to work */ - /* the maximum we can get is 640x480 with disabled scaler */ - /* and norm_maxw set to 640 */ - if(dev->width == 640 && dev->height == 480) - return em2820_write_regs(dev, COMPR_REG,"\x00",1); - if(dev->height > 288) - return em2820_write_regs(dev, COMPR_REG,"\x10",1); - if(dev->width > 360) - return em2820_write_regs(dev, COMPR_REG,"\x20",1); + u8 mode; + /* the em2800 scaler only supports scaling down to 50% */ + if(dev->is_em2800) + mode = (v ? 0x20 : 0x00) | (h ? 0x10 : 0x00); + else { + u8 buf[2]; + buf[0] = h; + buf[1] = h >> 8; + em2820_write_regs(dev, HSCALELOW_REG, (char *)buf, 2); + buf[0] = v; + buf[1] = v >> 8; + em2820_write_regs(dev, VSCALELOW_REG, (char *)buf, 2); + /* it seems that both H and V scalers must be active to work correctly */ + mode = (h || v)? 0x30: 0x00; } - /* when H and V mixershould be used? */ - /* return em2820_write_reg_bits(dev, COMPR_REG, (h ? 0x20 : 0x00) | (v ? 0x10 : 0x00), 0x30); */ - /* it seems that both H and V scalers must be active to work correctly */ - return em2820_write_reg_bits(dev, COMPR_REG, h - || v ? 0x30 : 0x00, 0x30); + return em2820_write_reg_bits(dev, COMPR_REG, mode, 0x30); } /* FIXME: this only function read values from dev */ |
