diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-21 11:21:23 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-21 11:21:23 +0200 |
| commit | 06e3b9b0bdf9034084ee98819fa971ead4812e11 (patch) | |
| tree | 4ba6e6570afe0127ff67d917cf602408821ec7ec /linux/drivers/media/video | |
| parent | d5894b0d3a62375eead5974658df270f69d06a1f (diff) | |
| download | mediapointer-dvb-s2-06e3b9b0bdf9034084ee98819fa971ead4812e11.tar.gz mediapointer-dvb-s2-06e3b9b0bdf9034084ee98819fa971ead4812e11.tar.bz2 | |
ivtv/cx18: fix video_temporal_filter handling
From: Hans Verkuil <hverkuil@xs4all.nl>
If the capture is scaled, then the video_temporal_filter is set to 0
by the cx2341x.c module since otherwise you would get ghosting.
However, this was also done in the VIDIOC_S_FMT ioctl which meant that
the video_temporal_filter control was reset to 0 or 8 each time S_FMT
was called. This was old code that should have been removed a long time
ago.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-ioctl.c | 11 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-ioctl.c | 9 |
2 files changed, 0 insertions, 20 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-ioctl.c b/linux/drivers/media/video/cx18/cx18-ioctl.c index 2dea6b676..7d901429f 100644 --- a/linux/drivers/media/video/cx18/cx18-ioctl.c +++ b/linux/drivers/media/video/cx18/cx18-ioctl.c @@ -229,13 +229,6 @@ static int cx18_try_fmt_vid_cap(struct file *file, void *fh, cx18_g_fmt_vid_cap(file, fh, fmt); fmt->fmt.pix.width = w; fmt->fmt.pix.height = h; -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18) - if (cx->params.width != 720 || - cx->params.height != (cx->is_50hz ? 576 : 480)) - cx->params.video_temporal_filter = 0; - else - cx->params.video_temporal_filter = 8; -#endif return 0; } @@ -299,10 +292,6 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh, cx->params.width = w; cx->params.height = h; - if (w != 720 || h != (cx->is_50hz ? 576 : 480)) - cx->params.video_temporal_filter = 0; - else - cx->params.video_temporal_filter = 8; cx18_av_cmd(cx, VIDIOC_S_FMT, fmt); return cx18_g_fmt_vid_cap(file, fh, fmt); } diff --git a/linux/drivers/media/video/ivtv/ivtv-ioctl.c b/linux/drivers/media/video/ivtv/ivtv-ioctl.c index d75c82e50..b1cda6cd5 100644 --- a/linux/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/linux/drivers/media/video/ivtv/ivtv-ioctl.c @@ -508,11 +508,6 @@ static int ivtv_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format ivtv_g_fmt_vid_cap(file, fh, fmt); fmt->fmt.pix.width = w; fmt->fmt.pix.height = h; - if (itv->params.width != 720 || - itv->params.height != (itv->is_50hz ? 576 : 480)) - itv->params.video_temporal_filter = 0; - else - itv->params.video_temporal_filter = 8; return 0; } @@ -608,10 +603,6 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f p->width = w; p->height = h; - if (w != 720 || h != (itv->is_50hz ? 576 : 480)) - p->video_temporal_filter = 0; - else - p->video_temporal_filter = 8; if (p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1) fmt->fmt.pix.width /= 2; itv->video_dec_func(itv, VIDIOC_S_FMT, fmt); |