cx2341x.c (75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37) | cx2341x.c (35aaa6e650c24212316781b63005f52c1988cd4e) |
---|---|
1// SPDX-License-Identifier: GPL-2.0-or-later 2/* 3 * cx2341x - generic code for cx23415/6/8 based devices 4 * 5 * Copyright (C) 2006 Hans Verkuil <hverkuil@xs4all.nl> 6 */ 7 8 --- 152 unchanged lines hidden (view full) --- 161 } 162} 163 164 165/********************** OLD CODE *********************/ 166 167/* Must be sorted from low to high control ID! */ 168const u32 cx2341x_mpeg_ctrls[] = { | 1// SPDX-License-Identifier: GPL-2.0-or-later 2/* 3 * cx2341x - generic code for cx23415/6/8 based devices 4 * 5 * Copyright (C) 2006 Hans Verkuil <hverkuil@xs4all.nl> 6 */ 7 8 --- 152 unchanged lines hidden (view full) --- 161 } 162} 163 164 165/********************** OLD CODE *********************/ 166 167/* Must be sorted from low to high control ID! */ 168const u32 cx2341x_mpeg_ctrls[] = { |
169 V4L2_CID_MPEG_CLASS, | 169 V4L2_CID_CODEC_CLASS, |
170 V4L2_CID_MPEG_STREAM_TYPE, 171 V4L2_CID_MPEG_STREAM_VBI_FMT, 172 V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ, 173 V4L2_CID_MPEG_AUDIO_ENCODING, 174 V4L2_CID_MPEG_AUDIO_L2_BITRATE, 175 V4L2_CID_MPEG_AUDIO_MODE, 176 V4L2_CID_MPEG_AUDIO_MODE_EXTENSION, 177 V4L2_CID_MPEG_AUDIO_EMPHASIS, --- 391 unchanged lines hidden (view full) --- 569} 570 571int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 572 struct v4l2_queryctrl *qctrl) 573{ 574 int err; 575 576 switch (qctrl->id) { | 170 V4L2_CID_MPEG_STREAM_TYPE, 171 V4L2_CID_MPEG_STREAM_VBI_FMT, 172 V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ, 173 V4L2_CID_MPEG_AUDIO_ENCODING, 174 V4L2_CID_MPEG_AUDIO_L2_BITRATE, 175 V4L2_CID_MPEG_AUDIO_MODE, 176 V4L2_CID_MPEG_AUDIO_MODE_EXTENSION, 177 V4L2_CID_MPEG_AUDIO_EMPHASIS, --- 391 unchanged lines hidden (view full) --- 569} 570 571int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params, 572 struct v4l2_queryctrl *qctrl) 573{ 574 int err; 575 576 switch (qctrl->id) { |
577 case V4L2_CID_MPEG_CLASS: | 577 case V4L2_CID_CODEC_CLASS: |
578 return v4l2_ctrl_query_fill(qctrl, 0, 0, 0, 0); 579 case V4L2_CID_MPEG_STREAM_TYPE: 580 return v4l2_ctrl_query_fill(qctrl, 581 V4L2_MPEG_STREAM_TYPE_MPEG2_PS, 582 V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD, 1, 583 V4L2_MPEG_STREAM_TYPE_MPEG2_PS); 584 585 case V4L2_CID_MPEG_STREAM_VBI_FMT: --- 1193 unchanged lines hidden --- | 578 return v4l2_ctrl_query_fill(qctrl, 0, 0, 0, 0); 579 case V4L2_CID_MPEG_STREAM_TYPE: 580 return v4l2_ctrl_query_fill(qctrl, 581 V4L2_MPEG_STREAM_TYPE_MPEG2_PS, 582 V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD, 1, 583 V4L2_MPEG_STREAM_TYPE_MPEG2_PS); 584 585 case V4L2_CID_MPEG_STREAM_VBI_FMT: --- 1193 unchanged lines hidden --- |