Commit 10afbef1 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1df79537

drivers/media/video/cx18/cx18-av-core.c

+5 −2
Original line number Diff line number Diff line
@@ -788,10 +788,12 @@ int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg) 


		switch (qc->id) {

		case V4L2_CID_BRIGHTNESS:

			return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);

		case V4L2_CID_CONTRAST:

		case V4L2_CID_SATURATION:

			return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);

		case V4L2_CID_HUE:

			return v4l2_ctrl_query_fill_std(qc);

			return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);

		default:

			break;

		}
@@ -801,10 +803,11 @@ int cx18_av_cmd(struct cx18 *cx, unsigned int cmd, void *arg) 
			return v4l2_ctrl_query_fill(qc, 0, 65535,

				65535 / 100, state->default_volume);

		case V4L2_CID_AUDIO_MUTE:

			return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);

		case V4L2_CID_AUDIO_BALANCE:

		case V4L2_CID_AUDIO_BASS:

		case V4L2_CID_AUDIO_TREBLE:

			return v4l2_ctrl_query_fill_std(qc);

			return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);

		default:

			return -EINVAL;

		}

drivers/media/video/cx2341x.c

+85 −23
Original line number Diff line number Diff line
@@ -500,6 +500,29 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 
	int err;



	switch (qctrl->id) {

	case V4L2_CID_MPEG_STREAM_TYPE:

		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_STREAM_TYPE_MPEG2_PS,

				V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD, 1,

				V4L2_MPEG_STREAM_TYPE_MPEG2_PS);



	case V4L2_CID_MPEG_STREAM_VBI_FMT:

		if (params->capabilities & CX2341X_CAP_HAS_SLICED_VBI)

			return v4l2_ctrl_query_fill(qctrl,

					V4L2_MPEG_STREAM_VBI_FMT_NONE,

					V4L2_MPEG_STREAM_VBI_FMT_IVTV, 1,

					V4L2_MPEG_STREAM_VBI_FMT_NONE);

		return cx2341x_ctrl_query_fill(qctrl,

				V4L2_MPEG_STREAM_VBI_FMT_NONE,

				V4L2_MPEG_STREAM_VBI_FMT_NONE, 1,

				default_params.stream_vbi_fmt);



	case V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ:

		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100,

				V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000, 1,

				V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000);



	case V4L2_CID_MPEG_AUDIO_ENCODING:

		if (params->capabilities & CX2341X_CAP_HAS_AC3) {

			/*
@@ -531,9 +554,36 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 
			qctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;

		return 0;



	case V4L2_CID_MPEG_AUDIO_L1_BITRATE:

	case V4L2_CID_MPEG_AUDIO_L3_BITRATE:

		return -EINVAL;

	case V4L2_CID_MPEG_AUDIO_MODE:

		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_AUDIO_MODE_STEREO,

				V4L2_MPEG_AUDIO_MODE_MONO, 1,

				V4L2_MPEG_AUDIO_MODE_STEREO);



	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:

		err = v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4,

				V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16, 1,

				V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4);

		if (err == 0 &&

		    params->audio_mode != V4L2_MPEG_AUDIO_MODE_JOINT_STEREO)

			qctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;

		return err;



	case V4L2_CID_MPEG_AUDIO_EMPHASIS:

		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_AUDIO_EMPHASIS_NONE,

				V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17, 1,

				V4L2_MPEG_AUDIO_EMPHASIS_NONE);



	case V4L2_CID_MPEG_AUDIO_CRC:

		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_AUDIO_CRC_NONE,

				V4L2_MPEG_AUDIO_CRC_CRC16, 1,

				V4L2_MPEG_AUDIO_CRC_NONE);



	case V4L2_CID_MPEG_AUDIO_MUTE:

		return v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 0);



	case V4L2_CID_MPEG_AUDIO_AC3_BITRATE:

		err = v4l2_ctrl_query_fill(qctrl,
@@ -550,13 +600,6 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 
			qctrl->flags |= V4L2_CTRL_FLAG_DISABLED;

		return 0;



	case V4L2_CID_MPEG_AUDIO_MODE_EXTENSION:

		err = v4l2_ctrl_query_fill_std(qctrl);

		if (err == 0 &&

		    params->audio_mode != V4L2_MPEG_AUDIO_MODE_JOINT_STEREO)

			qctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;

		return err;



	case V4L2_CID_MPEG_VIDEO_ENCODING:

		/* this setting is read-only for the cx2341x since the

		   V4L2_CID_MPEG_STREAM_TYPE really determines the
@@ -569,32 +612,51 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 
			qctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;

		return err;



	case V4L2_CID_MPEG_VIDEO_ASPECT:

		return v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_VIDEO_ASPECT_1x1,

				V4L2_MPEG_VIDEO_ASPECT_221x100, 1,

				V4L2_MPEG_VIDEO_ASPECT_4x3);



	case V4L2_CID_MPEG_VIDEO_B_FRAMES:

		return v4l2_ctrl_query_fill(qctrl, 0, 33, 1, 2);



	case V4L2_CID_MPEG_VIDEO_GOP_SIZE:

		return v4l2_ctrl_query_fill(qctrl, 1, 34, 1,

				params->is_50hz ? 12 : 15);



	case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:

		return v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 1);



	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:

		err = v4l2_ctrl_query_fill_std(qctrl);

		err = v4l2_ctrl_query_fill(qctrl,

				V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,

				V4L2_MPEG_VIDEO_BITRATE_MODE_CBR, 1,

				V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);

		if (err == 0 &&

		    params->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1)

			qctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;

		return err;



	case V4L2_CID_MPEG_VIDEO_BITRATE:

		return v4l2_ctrl_query_fill(qctrl, 0, 27000000, 1, 6000000);



	case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:

		err = v4l2_ctrl_query_fill_std(qctrl);

		err = v4l2_ctrl_query_fill(qctrl, 0, 27000000, 1, 8000000);

		if (err == 0 &&

		    params->video_bitrate_mode ==

				V4L2_MPEG_VIDEO_BITRATE_MODE_CBR)

			qctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;

		return err;



	case V4L2_CID_MPEG_STREAM_VBI_FMT:

		if (params->capabilities & CX2341X_CAP_HAS_SLICED_VBI)

			return v4l2_ctrl_query_fill_std(qctrl);

		return cx2341x_ctrl_query_fill(qctrl,

				V4L2_MPEG_STREAM_VBI_FMT_NONE,

				V4L2_MPEG_STREAM_VBI_FMT_NONE, 1,

				default_params.stream_vbi_fmt);

	case V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION:

		return v4l2_ctrl_query_fill(qctrl, 0, 255, 1, 0);



	case V4L2_CID_MPEG_VIDEO_GOP_SIZE:

		return v4l2_ctrl_query_fill(qctrl, 1, 34, 1,

				params->is_50hz ? 12 : 15);

	case V4L2_CID_MPEG_VIDEO_MUTE:

		return v4l2_ctrl_query_fill(qctrl, 0, 1, 1, 0);



	case V4L2_CID_MPEG_VIDEO_MUTE_YUV:  /* Init YUV (really YCbCr) to black */

		return v4l2_ctrl_query_fill(qctrl, 0, 0xffffff, 1, 0x008080);



	/* CX23415/6 specific */

	case V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE:
@@ -696,7 +758,7 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 
				default_params.stream_insert_nav_packets);



	default:

		return v4l2_ctrl_query_fill_std(qctrl);

		return -EINVAL;



	}

}

drivers/media/video/cx25840/cx25840-core.c

+5 −2
Original line number Diff line number Diff line
@@ -1205,10 +1205,12 @@ static int cx25840_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 


	switch (qc->id) {

	case V4L2_CID_BRIGHTNESS:

		return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);

	case V4L2_CID_CONTRAST:

	case V4L2_CID_SATURATION:

		return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);

	case V4L2_CID_HUE:

		return v4l2_ctrl_query_fill_std(qc);

		return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);

	default:

		break;

	}
@@ -1220,10 +1222,11 @@ static int cx25840_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 
		return v4l2_ctrl_query_fill(qc, 0, 65535,

				65535 / 100, state->default_volume);

	case V4L2_CID_AUDIO_MUTE:

		return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);

	case V4L2_CID_AUDIO_BALANCE:

	case V4L2_CID_AUDIO_BASS:

	case V4L2_CID_AUDIO_TREBLE:

		return v4l2_ctrl_query_fill_std(qc);

		return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);

	default:

		return -EINVAL;

	}

drivers/media/video/msp3400-driver.c

+14 −12
Original line number Diff line number Diff line
@@ -714,8 +714,9 @@ static int msp_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 


	switch (qc->id) {

	case V4L2_CID_AUDIO_VOLUME:

		return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 58880);

	case V4L2_CID_AUDIO_MUTE:

			return v4l2_ctrl_query_fill_std(qc);

		return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);

	default:

		break;

	}
@@ -723,10 +724,11 @@ static int msp_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 
		return -EINVAL;

	switch (qc->id) {

	case V4L2_CID_AUDIO_LOUDNESS:

		return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0);

	case V4L2_CID_AUDIO_BALANCE:

	case V4L2_CID_AUDIO_BASS:

	case V4L2_CID_AUDIO_TREBLE:

			return v4l2_ctrl_query_fill_std(qc);

		return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768);

	default:

		return -EINVAL;

	}

drivers/media/video/saa7115.c

+3 −1
Original line number Diff line number Diff line
@@ -1206,10 +1206,12 @@ static int saa711x_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 
{

	switch (qc->id) {

	case V4L2_CID_BRIGHTNESS:

		return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128);

	case V4L2_CID_CONTRAST:

	case V4L2_CID_SATURATION:

		return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64);

	case V4L2_CID_HUE:

		return v4l2_ctrl_query_fill_std(qc);

		return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0);

	default:

		return -EINVAL;

	}