aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-06-21 08:21:23 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:11:00 -0400
commite27bf207db4fc6dd500eb82611f102da85cfe7d0 (patch)
treeb36493b2f7199641929c9b84534ceba882ac321a /drivers/media/video/ivtv
parent5cf2cc4803a0415f7048951a727204df414325e6 (diff)
V4L/DVB (8086): ivtv/cx18: fix video_temporal_filter handling
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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r--drivers/media/video/ivtv/ivtv-ioctl.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index d75c82e509f7..b1cda6cd5582 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/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
508 ivtv_g_fmt_vid_cap(file, fh, fmt); 508 ivtv_g_fmt_vid_cap(file, fh, fmt);
509 fmt->fmt.pix.width = w; 509 fmt->fmt.pix.width = w;
510 fmt->fmt.pix.height = h; 510 fmt->fmt.pix.height = h;
511 if (itv->params.width != 720 ||
512 itv->params.height != (itv->is_50hz ? 576 : 480))
513 itv->params.video_temporal_filter = 0;
514 else
515 itv->params.video_temporal_filter = 8;
516 return 0; 511 return 0;
517} 512}
518 513
@@ -608,10 +603,6 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
608 603
609 p->width = w; 604 p->width = w;
610 p->height = h; 605 p->height = h;
611 if (w != 720 || h != (itv->is_50hz ? 576 : 480))
612 p->video_temporal_filter = 0;
613 else
614 p->video_temporal_filter = 8;
615 if (p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1) 606 if (p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1)
616 fmt->fmt.pix.width /= 2; 607 fmt->fmt.pix.width /= 2;
617 itv->video_dec_func(itv, VIDIOC_S_FMT, fmt); 608 itv->video_dec_func(itv, VIDIOC_S_FMT, fmt);