diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-12-18 11:40:23 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-27 11:19:42 -0500 |
commit | 83aaf13c5ba5e1e244339807d8a752808e763cdd (patch) | |
tree | 1b1e294608470f47f2d3164cbf4e0557ffbcc5c2 /drivers/media | |
parent | 12b896e436a3b1bc83856962388ae1ab154742a6 (diff) |
V4L/DVB (4984): LOG_STATUS should show the real temporal filter value.
The temporal filter is forced off when scaling. The VIDIOC_LOG_STATUS
handler still showed the old temporal filter. It is now consistent with
the real temporal filter value.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx2341x.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c index e796afdf533b..2f5ca71e0261 100644 --- a/drivers/media/video/cx2341x.c +++ b/drivers/media/video/cx2341x.c | |||
@@ -863,6 +863,7 @@ invalid: | |||
863 | void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix) | 863 | void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix) |
864 | { | 864 | { |
865 | int is_mpeg1 = p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1; | 865 | int is_mpeg1 = p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1; |
866 | int temporal = p->video_temporal_filter; | ||
866 | 867 | ||
867 | /* Stream */ | 868 | /* Stream */ |
868 | printk(KERN_INFO "%s: Stream: %s\n", | 869 | printk(KERN_INFO "%s: Stream: %s\n", |
@@ -919,10 +920,13 @@ void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix) | |||
919 | cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE), | 920 | cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE), |
920 | cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE), | 921 | cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE), |
921 | p->video_spatial_filter); | 922 | p->video_spatial_filter); |
923 | if (p->width != 720 || p->height != (p->is_50hz ? 576 : 480)) { | ||
924 | temporal = 0; | ||
925 | } | ||
922 | printk(KERN_INFO "%s: Temporal Filter: %s, %d\n", | 926 | printk(KERN_INFO "%s: Temporal Filter: %s, %d\n", |
923 | prefix, | 927 | prefix, |
924 | cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE), | 928 | cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE), |
925 | p->video_temporal_filter); | 929 | temporal); |
926 | printk(KERN_INFO "%s: Median Filter: %s, Luma [%d, %d], Chroma [%d, %d]\n", | 930 | printk(KERN_INFO "%s: Median Filter: %s, Luma [%d, %d], Chroma [%d, %d]\n", |
927 | prefix, | 931 | prefix, |
928 | cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE), | 932 | cx2341x_menu_item(p, V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE), |