diff options
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/common/saa7146_hlp.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_v4l.c | 24 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/budget-av.c | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/linux/drivers/media/common/saa7146_hlp.c b/linux/drivers/media/common/saa7146_hlp.c index cb846432e..3722cea5b 100644 --- a/linux/drivers/media/common/saa7146_hlp.c +++ b/linux/drivers/media/common/saa7146_hlp.c @@ -536,13 +536,13 @@ static void saa7146_set_window(struct saa7146_dev *dev, int width, int height, e /* set vertical scale */ hps_v_scale = 0; /* all bits get set by the function-call */ hps_v_gain = 0; /* fixme: saa7146_read(dev, HPS_V_GAIN);*/ - calculate_v_scale_registers(dev, field, vv->standard->v_calc, height, &hps_v_scale, &hps_v_gain); + calculate_v_scale_registers(dev, field, vv->standard->v_field*2, height, &hps_v_scale, &hps_v_gain); /* set horizontal scale */ hps_ctrl = 0; hps_h_prescale = 0; /* all bits get set in the function */ hps_h_scale = 0; - calculate_h_scale_registers(dev, vv->standard->h_calc, width, vv->hflip, &hps_ctrl, &hps_v_gain, &hps_h_prescale, &hps_h_scale); + calculate_h_scale_registers(dev, vv->standard->h_pixels, width, vv->hflip, &hps_ctrl, &hps_v_gain, &hps_h_prescale, &hps_h_scale); /* set hyo and hxo */ calculate_hxo_and_hyo(vv, &hps_h_scale, &hps_ctrl); diff --git a/linux/drivers/media/dvb/ttpci/av7110_v4l.c b/linux/drivers/media/dvb/ttpci/av7110_v4l.c index c2cd7e3c4..a70fdaa46 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/linux/drivers/media/dvb/ttpci/av7110_v4l.c @@ -627,13 +627,13 @@ int av7110_exit_v4l(struct av7110 *av7110) static struct saa7146_standard standard[] = { { .name = "PAL", .id = V4L2_STD_PAL_BG, - .v_offset = 0x15, .v_field = 288, .v_calc = 576, - .h_offset = 0x48, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x15, .v_field = 288, + .h_offset = 0x48, .h_pixels = 708, .v_max_out = 576, .h_max_out = 768, }, { .name = "NTSC", .id = V4L2_STD_NTSC, - .v_offset = 0x10, .v_field = 244, .v_calc = 480, - .h_offset = 0x40, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x10, .v_field = 244, + .h_offset = 0x40, .h_pixels = 708, .v_max_out = 480, .h_max_out = 640, } }; @@ -641,13 +641,13 @@ static struct saa7146_standard standard[] = { static struct saa7146_standard analog_standard[] = { { .name = "PAL", .id = V4L2_STD_PAL_BG, - .v_offset = 0x1b, .v_field = 288, .v_calc = 576, - .h_offset = 0x08, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x1b, .v_field = 288, + .h_offset = 0x08, .h_pixels = 708, .v_max_out = 576, .h_max_out = 768, }, { .name = "NTSC", .id = V4L2_STD_NTSC, - .v_offset = 0x10, .v_field = 244, .v_calc = 480, - .h_offset = 0x40, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x10, .v_field = 244, + .h_offset = 0x40, .h_pixels = 708, .v_max_out = 480, .h_max_out = 640, } }; @@ -655,13 +655,13 @@ static struct saa7146_standard analog_standard[] = { static struct saa7146_standard dvb_standard[] = { { .name = "PAL", .id = V4L2_STD_PAL_BG, - .v_offset = 0x14, .v_field = 288, .v_calc = 576, - .h_offset = 0x48, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x14, .v_field = 288, + .h_offset = 0x48, .h_pixels = 708, .v_max_out = 576, .h_max_out = 768, }, { .name = "NTSC", .id = V4L2_STD_NTSC, - .v_offset = 0x10, .v_field = 244, .v_calc = 480, - .h_offset = 0x40, .h_pixels = 708, .h_calc = 708, + .v_offset = 0x10, .v_field = 244, + .h_offset = 0x40, .h_pixels = 708, .v_max_out = 480, .h_max_out = 640, } }; diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c index 926d95f91..e51daed59 100644 --- a/linux/drivers/media/dvb/ttpci/budget-av.c +++ b/linux/drivers/media/dvb/ttpci/budget-av.c @@ -333,13 +333,13 @@ static int av_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) static struct saa7146_standard standard[] = { { .name = "PAL", .id = V4L2_STD_PAL, - .v_offset = 0x17, .v_field = 288, .v_calc = 576, - .h_offset = 0x14, .h_pixels = 680, .h_calc = 680+1, - .v_max_out = 576, .h_max_out = 768, + .v_offset = 0x17, .v_field = 288, + .h_offset = 0x14, .h_pixels = 680, + .v_max_out = 576, .h_max_out = 768 }, { .name = "NTSC", .id = V4L2_STD_NTSC, - .v_offset = 0x16, .v_field = 240, .v_calc = 480, - .h_offset = 0x06, .h_pixels = 708, .h_calc = 708+1, + .v_offset = 0x16, .v_field = 240, + .h_offset = 0x06, .h_pixels = 708, .v_max_out = 480, .h_max_out = 640, } }; |