diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-21 16:47:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:54 -0400 |
commit | 10afbef15e7bba5e1008f583852077743d28c395 (patch) | |
tree | 73dbfe2a3ccde6ef75c3403fb189274247740003 /drivers/media/video/saa7134/saa6752hs.c | |
parent | 1df795370c1392a026c63816368108187aec2ec1 (diff) |
V4L/DVB (10698): v4l2-common: remove v4l2_ctrl_query_fill_std
The v4l2_ctrl_query_fill_std() function wasn't one the best idea I ever had.
It doesn't add anything valuable that cannot be expressed equally well with
v4l2_ctrl_query_fill and only adds overhead.
Replace it with v4l2_ctrl_query_fill() everywhere it is used and remove it
from v4l2_common.c.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa6752hs.c')
-rw-r--r-- | drivers/media/video/saa7134/saa6752hs.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c index 2d292ad776e9..dc2213e2f86e 100644 --- a/drivers/media/video/saa7134/saa6752hs.c +++ b/drivers/media/video/saa7134/saa6752hs.c | |||
@@ -592,7 +592,7 @@ static int saa6752hs_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc | |||
592 | V4L2_MPEG_VIDEO_ASPECT_4x3); | 592 | V4L2_MPEG_VIDEO_ASPECT_4x3); |
593 | 593 | ||
594 | case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK: | 594 | case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK: |
595 | err = v4l2_ctrl_query_fill_std(qctrl); | 595 | err = v4l2_ctrl_query_fill(qctrl, 0, 27000000, 1, 8000000); |
596 | if (err == 0 && | 596 | if (err == 0 && |
597 | params->vi_bitrate_mode == | 597 | params->vi_bitrate_mode == |
598 | V4L2_MPEG_VIDEO_BITRATE_MODE_CBR) | 598 | V4L2_MPEG_VIDEO_BITRATE_MODE_CBR) |
@@ -606,12 +606,20 @@ static int saa6752hs_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc | |||
606 | V4L2_MPEG_STREAM_TYPE_MPEG2_TS); | 606 | V4L2_MPEG_STREAM_TYPE_MPEG2_TS); |
607 | 607 | ||
608 | case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: | 608 | case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: |
609 | return v4l2_ctrl_query_fill(qctrl, | ||
610 | V4L2_MPEG_VIDEO_BITRATE_MODE_VBR, | ||
611 | V4L2_MPEG_VIDEO_BITRATE_MODE_CBR, 1, | ||
612 | V4L2_MPEG_VIDEO_BITRATE_MODE_VBR); | ||
609 | case V4L2_CID_MPEG_VIDEO_BITRATE: | 613 | case V4L2_CID_MPEG_VIDEO_BITRATE: |
614 | return v4l2_ctrl_query_fill(qctrl, 0, 27000000, 1, 6000000); | ||
610 | case V4L2_CID_MPEG_STREAM_PID_PMT: | 615 | case V4L2_CID_MPEG_STREAM_PID_PMT: |
616 | return v4l2_ctrl_query_fill(qctrl, 0, (1 << 14) - 1, 1, 16); | ||
611 | case V4L2_CID_MPEG_STREAM_PID_AUDIO: | 617 | case V4L2_CID_MPEG_STREAM_PID_AUDIO: |
618 | return v4l2_ctrl_query_fill(qctrl, 0, (1 << 14) - 1, 1, 260); | ||
612 | case V4L2_CID_MPEG_STREAM_PID_VIDEO: | 619 | case V4L2_CID_MPEG_STREAM_PID_VIDEO: |
620 | return v4l2_ctrl_query_fill(qctrl, 0, (1 << 14) - 1, 1, 256); | ||
613 | case V4L2_CID_MPEG_STREAM_PID_PCR: | 621 | case V4L2_CID_MPEG_STREAM_PID_PCR: |
614 | return v4l2_ctrl_query_fill_std(qctrl); | 622 | return v4l2_ctrl_query_fill(qctrl, 0, (1 << 14) - 1, 1, 259); |
615 | 623 | ||
616 | default: | 624 | default: |
617 | break; | 625 | break; |