diff options
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-vbi.c | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 4 | ||||
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-vbi.c b/linux/drivers/media/video/cx25840/cx25840-vbi.c index f78f8cd2d..876adbcba 100644 --- a/linux/drivers/media/video/cx25840/cx25840-vbi.c +++ b/linux/drivers/media/video/cx25840/cx25840-vbi.c @@ -129,7 +129,14 @@ void cx25840_vbi_setup(struct i2c_client *client) uv_lpf=1; src_decimation=0x21f; - if (std == V4L2_STD_PAL_M) { + if (std == V4L2_STD_PAL_60) { + vblank=26; + vblank656=26; + burst=0x5b; + luma_lpf=2; + comb=0x20; + sc=0x0a8263; + } else if (std == V4L2_STD_PAL_M) { vblank=20; vblank656=24; burst=0x61; diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index b1db6bf50..a42204b02 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -308,6 +308,10 @@ static int tuner_fixup_std(struct tuner *t) { if ((t->std & V4L2_STD_PAL) == V4L2_STD_PAL) { switch (pal[0]) { + case '6': + tuner_dbg ("insmod fixup: PAL => PAL-60\n"); + t->std = V4L2_STD_PAL_60; + break; case 'b': case 'B': case 'g': diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index 7dabb3969..a0b14d9fb 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -242,7 +242,7 @@ static void usage(void) printf(" -s, --set-standard=<num>\n"); printf(" set the video standard to <num> [VIDIOC_S_STD]\n"); printf(" <num> can be a numerical v4l2_std value, or it can be one of:\n"); - printf(" pal-X (X = B/G/H/N/Nc/I/D/K/M) or just 'pal' (V4L2_STD_PAL)\n"); + printf(" pal-X (X = B/G/H/N/Nc/I/D/K/M/60) or just 'pal' (V4L2_STD_PAL)\n"); printf(" ntsc-X (X = M/J/K) or just 'ntsc' (V4L2_STD_NTSC)\n"); printf(" secam-X (X = B/G/H/D/K/L/Lc) or just 'secam' (V4L2_STD_SECAM)\n"); printf(" --list-standards display supported video standards [VIDIOC_ENUMSTD]\n"); @@ -778,6 +778,8 @@ static v4l2_std_id parse_pal(const char *pal) { if (pal[0] == '-') { switch (pal[1]) { + case '6': + return V4L2_STD_PAL_60; case 'b': case 'B': case 'g': |