V4L/DVB (4986): Removed unimplemented cx2341x API commands
The commands CX2341X_DEC_SET_AUDIO_OUTPUT, CX2341X_DEC_SET_AV_DELAY and CX2341X_ENC_SET_3_2_PULLDOWN are not implemented in the Conexant firmware. So these commands are removed. This also means that the V4L2_CID_MPEG_VIDEO_PULLDOWN control in cx2341x.c and pvrusb2-hdw.c is removed. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
20a919f796
commit
75558ab92d
4 changed files with 2 additions and 32 deletions
|
@ -213,16 +213,6 @@ Param[1]
|
|||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
Name CX2341X_ENC_SET_3_2_PULLDOWN
|
||||
Enum 177/0xB1
|
||||
Description
|
||||
3:2 pulldown properties (This command is not implemented in the firmware)
|
||||
Param[0]
|
||||
0=enabled
|
||||
1=disabled
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
Name CX2341X_ENC_SET_VBI_LINE
|
||||
Enum 183/0xB7
|
||||
Description
|
||||
|
|
|
@ -56,7 +56,6 @@ const u32 cx2341x_mpeg_ctrls[] = {
|
|||
V4L2_CID_MPEG_VIDEO_B_FRAMES,
|
||||
V4L2_CID_MPEG_VIDEO_GOP_SIZE,
|
||||
V4L2_CID_MPEG_VIDEO_GOP_CLOSURE,
|
||||
V4L2_CID_MPEG_VIDEO_PULLDOWN,
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE,
|
||||
V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,
|
||||
|
@ -118,9 +117,6 @@ static int cx2341x_get_ctrl(struct cx2341x_mpeg_params *params,
|
|||
case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:
|
||||
ctrl->value = params->video_gop_closure;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_PULLDOWN:
|
||||
ctrl->value = params->video_pulldown;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:
|
||||
ctrl->value = params->video_bitrate_mode;
|
||||
break;
|
||||
|
@ -231,9 +227,6 @@ static int cx2341x_set_ctrl(struct cx2341x_mpeg_params *params,
|
|||
case V4L2_CID_MPEG_VIDEO_GOP_CLOSURE:
|
||||
params->video_gop_closure = ctrl->value;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_PULLDOWN:
|
||||
params->video_pulldown = ctrl->value;
|
||||
break;
|
||||
case V4L2_CID_MPEG_VIDEO_BITRATE_MODE:
|
||||
/* MPEG-1 only allows CBR */
|
||||
if (params->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1 &&
|
||||
|
@ -679,7 +672,6 @@ void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p)
|
|||
.video_b_frames = 2,
|
||||
.video_gop_size = 12,
|
||||
.video_gop_closure = 1,
|
||||
.video_pulldown = 0,
|
||||
.video_bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
|
||||
.video_bitrate = 6000000,
|
||||
.video_bitrate_peak = 8000000,
|
||||
|
@ -783,10 +775,6 @@ int cx2341x_update(void *priv, cx2341x_mbox_func func,
|
|||
err = cx2341x_api(priv, func, CX2341X_ENC_SET_GOP_CLOSURE, 1, new->video_gop_closure);
|
||||
if (err) return err;
|
||||
}
|
||||
if (old == NULL || old->video_pulldown != new->video_pulldown) {
|
||||
err = cx2341x_api(priv, func, CX2341X_ENC_SET_3_2_PULLDOWN, 1, new->video_pulldown);
|
||||
if (err) return err;
|
||||
}
|
||||
if (old == NULL || old->audio_properties != new->audio_properties) {
|
||||
err = cx2341x_api(priv, func, CX2341X_ENC_SET_AUDIO_PROPERTIES, 1, new->audio_properties);
|
||||
if (err) return err;
|
||||
|
@ -888,11 +876,10 @@ void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix)
|
|||
printk(", Peak %d", p->video_bitrate_peak);
|
||||
}
|
||||
printk("\n");
|
||||
printk(KERN_INFO "%s: Video: GOP Size %d, %d B-Frames, %sGOP Closure, %s3:2 Pulldown\n",
|
||||
printk(KERN_INFO "%s: Video: GOP Size %d, %d B-Frames, %sGOP Closure\n",
|
||||
prefix,
|
||||
p->video_gop_size, p->video_b_frames,
|
||||
p->video_gop_closure ? "" : "No ",
|
||||
p->video_pulldown ? "" : "No ");
|
||||
p->video_gop_closure ? "" : "No ");
|
||||
if (p->video_temporal_decimation) {
|
||||
printk(KERN_INFO "%s: Video: Temporal Decimation %d\n",
|
||||
prefix, p->video_temporal_decimation);
|
||||
|
|
|
@ -159,9 +159,6 @@ static const struct pvr2_mpeg_ids mpeg_ids[] = {
|
|||
},{
|
||||
.strid = "video_gop_closure",
|
||||
.id = V4L2_CID_MPEG_VIDEO_GOP_CLOSURE,
|
||||
},{
|
||||
.strid = "video_pulldown",
|
||||
.id = V4L2_CID_MPEG_VIDEO_PULLDOWN,
|
||||
},{
|
||||
.strid = "video_bitrate_mode",
|
||||
.id = V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
|
||||
|
|
|
@ -57,7 +57,6 @@ struct cx2341x_mpeg_params {
|
|||
u16 video_b_frames;
|
||||
u16 video_gop_size;
|
||||
u16 video_gop_closure;
|
||||
u16 video_pulldown;
|
||||
enum v4l2_mpeg_video_bitrate_mode video_bitrate_mode;
|
||||
u32 video_bitrate;
|
||||
u32 video_bitrate_peak;
|
||||
|
@ -121,8 +120,6 @@ void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix);
|
|||
#define CX2341X_DEC_SET_DISPLAY_BUFFERS 0x18
|
||||
#define CX2341X_DEC_EXTRACT_VBI 0x19
|
||||
#define CX2341X_DEC_SET_DECODER_SOURCE 0x1a
|
||||
#define CX2341X_DEC_SET_AUDIO_OUTPUT 0x1b
|
||||
#define CX2341X_DEC_SET_AV_DELAY 0x1c
|
||||
#define CX2341X_DEC_SET_PREBUFFERING 0x1e
|
||||
|
||||
/* MPEG encoder API */
|
||||
|
@ -141,7 +138,6 @@ void cx2341x_log_status(struct cx2341x_mpeg_params *p, const char *prefix);
|
|||
#define CX2341X_ENC_SET_DNR_FILTER_PROPS 0x9d
|
||||
#define CX2341X_ENC_SET_CORING_LEVELS 0x9f
|
||||
#define CX2341X_ENC_SET_SPATIAL_FILTER_TYPE 0xa1
|
||||
#define CX2341X_ENC_SET_3_2_PULLDOWN 0xb1
|
||||
#define CX2341X_ENC_SET_VBI_LINE 0xb7
|
||||
#define CX2341X_ENC_SET_STREAM_TYPE 0xb9
|
||||
#define CX2341X_ENC_SET_OUTPUT_PORT 0xbb
|
||||
|
|
Loading…
Reference in a new issue