diff options
| author | Steven Toth | 2010-07-31 20:28:18 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-10-21 11:54:57 +0200 |
| commit | f6eeece8ec2a323f004265527282f443e083d25a (patch) | |
| tree | a9a4cfef78be1c2bdd725164db7b6acdda505f8c /drivers/media/video/saa7164/saa7164-api.c | |
| parent | [media] saa7164: adjust the PS pack size handling to fill buffers 100% (diff) | |
| download | kernel-qcow2-linux-f6eeece8ec2a323f004265527282f443e083d25a.tar.gz kernel-qcow2-linux-f6eeece8ec2a323f004265527282f443e083d25a.tar.xz kernel-qcow2-linux-f6eeece8ec2a323f004265527282f443e083d25a.zip | |
[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>
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-api.c')
| -rw-r--r-- | drivers/media/video/saa7164/saa7164-api.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c index 5630a5d40896..9fd39326b85a 100644 --- a/drivers/media/video/saa7164/saa7164-api.c +++ b/drivers/media/video/saa7164/saa7164-api.c @@ -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; @@ -111,6 +117,11 @@ int saa7164_api_get_encoder(struct saa7164_port *port) 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) printk(KERN_ERR "%s() error, ret = 0x%x\n", __func__, ret); |