V4L/DVB (12797): tm6000: Allow selecting audio bitrate

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index 5497b7c4aea88af23fedb0bd508cf4faf431239e..3f2727d5b957ee2b83aad4ca101b1e9e8645895a 100644 (file)
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -722,9 +722,11 @@ printk("Original value=%d\n",val);
        switch (bitrate) {
        case 44100:
                val|=0xd0;
+               dev->audio_bitrate=bitrate;
                break;
        case 48000:
                val|=0x60;
+               dev->audio_bitrate=bitrate;
                break;
        }
        val=tm6000_set_reg (dev, REQ_07_SET_GET_AVREG, 0xeb, val);

diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index 65510d853814255289326fc37a1148d6b67f10f2..ced4b478f6b178e8ae508fdc4864208ae17bc6a5 100644 (file)
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -566,8 +566,7 @@ static int tm6000_prepare_isoc(struct tm6000_core *dev,
                dev->isoc_ctl.urb[i] = urb;
 
                dev->isoc_ctl.transfer_buffer[i] = usb_buffer_alloc(dev->udev,
-                       sb_size, GFP_KERNEL,
-                       &dev->isoc_ctl.urb[i]->transfer_dma);
+                       sb_size, GFP_KERNEL, &urb->transfer_dma);
                if (!dev->isoc_ctl.transfer_buffer[i]) {
                        tm6000_err ("unable to allocate %i bytes for transfer"
                                        " buffer %i\n", sb_size, i);
@@ -787,14 +786,32 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
                urb_init=1;
 
        if (urb_init) {
-               /* Should allocate/request at least h
-                  res x v res x 2 bytes/pixel */
-               urbsize=(buf->vb.size+dev->max_isoc_in-1)/dev->max_isoc_in;
-
-                /* Hack to allocate memory for Video + Audio */
-               /* FIXME: should also consider header ovehead of
-                  4 bytes/180 bytes */
-               urbsize+=((48000*4+24)/25+dev->max_isoc_in-1)/dev->max_isoc_in;
+               /* memory for video
+                  Should be at least
+                  Vres x Vres x 2 bytes/pixel by frame */
+               urbsize=buf->vb.size;
+
+                /* memory for audio
+                   Should be at least
+                   bitrate * 2 channels * 2 bytes / frame rate */
+               if (dev->norm & V4L2_STD_525_60) {
+                       urbsize+=(dev->audio_bitrate*4+29)/30;
+               } else {
+                       urbsize+=(dev->audio_bitrate*4+24)/25;
+               }
+
+               /* each audio frame seeems to have a frame number
+                  with 2 bytes */
+               urbsize+=2;
+
+               /* Add 4 bytes by each 180 bytes frame */
+               urbsize+=((urbsize+179)/180)*4;
+
+               /* Round to an enough number of URBs */
+               urbsize=(urbsize+dev->max_isoc_in-1)/dev->max_isoc_in;
+
+
+printk("Allocating %d packets to handle %lu size\n",  urbsize,buf->vb.size);
 
                dprintk(dev, V4L2_DEBUG_QUEUE, "Allocating %d packets to handle "
                                        "%lu size\n", urbsize,buf->vb.size);

diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/staging/tm6000/tm6000.h
index 479b4fb520dddd3d4fb606d0210f3e79acf4ea1e..a5977e7ce51b556226b2f1bd442e059b3054869e 100644 (file)
--- a/drivers/staging/tm6000/tm6000.h
+++ b/drivers/staging/tm6000/tm6000.h
@@ -137,6 +137,7 @@ struct tm6000_core {
        /* Demodulator configuration */
        int                             demod_addr;     /* demodulator address */
 
+       int                             audio_bitrate;
        /* i2c i/o */
        struct i2c_adapter              i2c_adap;
        struct i2c_client               i2c_client;