[media] saa7164: Implement resolution control firmware command
.. also fix a minor line 80 wrapping coding style issue. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
a97781ac91
commit
f6eeece8ec
|
@ -63,6 +63,12 @@ int saa7164_api_set_encoder(struct saa7164_port *port)
|
|||
if (ret != SAA_OK)
|
||||
printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
|
||||
|
||||
/* Resolution */
|
||||
ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, SET_CUR,
|
||||
EU_PROFILE_CONTROL, sizeof(u8), &port->encoder_profile);
|
||||
if (ret != SAA_OK)
|
||||
printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
|
||||
|
||||
/* Establish video bitrates */
|
||||
if (port->encoder_params.bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR)
|
||||
vb.ucVideoBitRateMode = EU_VIDEO_BIT_RATE_MODE_CONSTANT;
|
||||
|
@ -110,6 +116,11 @@ int saa7164_api_get_encoder(struct saa7164_port *port)
|
|||
if (ret != SAA_OK)
|
||||
printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
|
||||
|
||||
ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, GET_CUR,
|
||||
EU_VIDEO_RESOLUTION_CONTROL, sizeof(u8), &port->video_resolution);
|
||||
if (ret != SAA_OK)
|
||||
printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret);
|
||||
|
||||
ret = saa7164_cmd_send(port->dev, port->hwcfg.sourceid, GET_CUR,
|
||||
EU_VIDEO_FORMAT_CONTROL, sizeof(u8), &port->video_format);
|
||||
if (ret != SAA_OK)
|
||||
|
|
|
@ -339,7 +339,8 @@ static void saa7164_work_enchandler(struct work_struct *w)
|
|||
|
||||
if (buf->actual_size <= ubuf->actual_size) {
|
||||
|
||||
memcpy_fromio(ubuf->data, buf->cpu, ubuf->actual_size);
|
||||
memcpy_fromio(ubuf->data, port->shadow_buf[rp],
|
||||
ubuf->actual_size);
|
||||
|
||||
/* Throw a new checksum on the read buffer */
|
||||
ubuf->crc = crc32(0, ubuf->data, ubuf->actual_size);
|
||||
|
|
|
@ -205,6 +205,7 @@
|
|||
#define EU_PROFILE_CONTROL 0x00
|
||||
#define EU_VIDEO_FORMAT_CONTROL 0x01
|
||||
#define EU_VIDEO_BIT_RATE_CONTROL 0x02
|
||||
#define EU_VIDEO_RESOLUTION_CONTROL 0x03
|
||||
#define EU_VIDEO_GOP_STRUCTURE_CONTROL 0x04
|
||||
#define EU_VIDEO_INPUT_ASPECT_CONTROL 0x0A
|
||||
#define EU_AUDIO_FORMAT_CONTROL 0x0C
|
||||
|
|
Loading…
Reference in a new issue