Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] saa7164: allow variable length GOP sizes and switch encoder default to CBR

Browse source 
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth 2010-07-31 15:05:35 -03:00 committed by Mauro Carvalho Chehab
parent f91d095c92
commit 5fa56ccdac
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/video/saa7164/saa7164-api.c
View file

@ -33,7 +33,7 @@ int saa7164_api_set_gop_size(struct saa7164_port *port)
dprintk(DBGLVL_ENC, "%s()\n", __func__);
gs.ucRefFrameDist = port->encoder_params.refdist;
gs.ucGOPSize = SAA7164_ENCODER_DEFAULT_GOP_SIZE;
gs.ucGOPSize = port->encoder_params.gop_size;
ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, SET_CUR,
EU_VIDEO_GOP_STRUCTURE_CONTROL,
sizeof(gs), &gs);

15
drivers/media/video/saa7164/saa7164-encoder.c
View file

@ -42,14 +42,14 @@ static const u32 saa7164_v4l2_ctrls[] = {
V4L2_CID_HUE,
V4L2_CID_AUDIO_VOLUME,
V4L2_CID_SHARPNESS,
V4L2_CID_MPEG_VIDEO_ASPECT,
V4L2_CID_MPEG_VIDEO_GOP_SIZE,
V4L2_CID_MPEG_STREAM_TYPE,
V4L2_CID_MPEG_VIDEO_ASPECT,
V4L2_CID_MPEG_VIDEO_B_FRAMES,
V4L2_CID_MPEG_VIDEO_GOP_SIZE,
V4L2_CID_MPEG_AUDIO_MUTE,
V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
V4L2_CID_MPEG_VIDEO_BITRATE,
V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,
V4L2_CID_MPEG_VIDEO_B_FRAMES,
0
};
@ -392,6 +392,9 @@ static int saa7164_get_ctrl(struct saa7164_port *port,
case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:
ctrl->value = params->bitrate_peak;
break;
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
ctrl->value = params->gop_size;
break;
default:
return -EINVAL;
}
@ -535,6 +538,9 @@ static int saa7164_set_ctrl(struct saa7164_port *port,
case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK:
params->bitrate_peak = ctrl->value;
break;
case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
params->gop_size = ctrl->value;
break;
default:
return -EINVAL;
}
@ -1336,11 +1342,12 @@ int saa7164_encoder_register(struct saa7164_port *port)
port->ctl_sharpness = 8;
port->encoder_params.bitrate = ENCODER_DEF_BITRATE;
port->encoder_params.bitrate_peak = ENCODER_DEF_BITRATE;
port->encoder_params.bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR;
port->encoder_params.bitrate_mode = V4L2_MPEG_VIDEO_BITRATE_MODE_CBR;
port->encoder_params.stream_type = V4L2_MPEG_STREAM_TYPE_MPEG2_PS;
port->encoder_params.ctl_mute = 0;
port->encoder_params.ctl_aspect = V4L2_MPEG_VIDEO_ASPECT_4x3;
port->encoder_params.refdist = 1;
port->encoder_params.gop_size = SAA7164_ENCODER_DEFAULT_GOP_SIZE;
if (port->encodernorm.id & V4L2_STD_525_60)
port->height = 480;

1
drivers/media/video/saa7164/saa7164.h
View file

@ -263,6 +263,7 @@ struct saa7164_encoder_params {
u32 ctl_mute;
u32 ctl_aspect;
u32 refdist;
u32 gop_size;
};
struct saa7164_port;