diff options
| author | Mike Isely <isely@pobox.com> | 2007-04-28 18:08:33 -0500 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2007-04-28 18:08:33 -0500 |
| commit | ef76e05c4f054b0abe4ef6191adfac147cea7f82 (patch) | |
| tree | 59c85a597d4088fedbdefe8ecefb4d9c7c54d7c0 /linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c | |
| parent | d4f778181491264d5a7fab04d2304a38011f8876 (diff) | |
| download | mediapointer-dvb-s2-ef76e05c4f054b0abe4ef6191adfac147cea7f82.tar.gz mediapointer-dvb-s2-ef76e05c4f054b0abe4ef6191adfac147cea7f82.tar.bz2 | |
pvrusb2: Improve handling of PAL-60 video standard
From: Mike Isely <isely@pobox.com>
This patch originated with Servaas Vandenberghe <vdb128@picaros.org>
and has been further developed a bit (to preserve saa7115 behavior).
These changes allow for correct operation of PAL-60 video (Servaas
tested this against a PAL-B/G tuner with the video standard overridden
as a module option).
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c index a7424f847..4abee970c 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-encoder.c @@ -424,22 +424,29 @@ static int pvr2_encoder_prep_config(struct pvr2_hdw *hdw) int pvr2_encoder_configure(struct pvr2_hdw *hdw) { int ret; + int val; pvr2_trace(PVR2_TRACE_ENCODER,"pvr2_encoder_configure" " (cx2341x module)"); hdw->enc_ctl_state.port = CX2341X_PORT_STREAMING; hdw->enc_ctl_state.width = hdw->res_hor_val; hdw->enc_ctl_state.height = hdw->res_ver_val; - hdw->enc_ctl_state.is_50hz = ((hdw->std_mask_cur & - (V4L2_STD_NTSC|V4L2_STD_PAL_M)) ? + hdw->enc_ctl_state.is_50hz = ((hdw->std_mask_cur & V4L2_STD_525_60) ? 0 : 1); ret = 0; ret |= pvr2_encoder_prep_config(hdw); + /* saa7115: 0xf0 */ + val = 0xf0; + if (hdw->hdw_type == PVR2_HDW_TYPE_24XXX) { + /* ivtv cx25840: 0x140 */ + val = 0x140; + } + if (!ret) ret = pvr2_encoder_vcmd( hdw,CX2341X_ENC_SET_NUM_VSYNC_LINES, 2, - 0xf0, 0xf0); + val, val); /* setup firmware to notify us about some events (don't know why...) */ if (!ret) ret = pvr2_encoder_vcmd( |