V4L/DVB: tm6000: rewrite copy_streams
Merge function copy streams() and copy_packets() into a new function copy_streams(), fixing the bugs. Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Stefan Ringel
Mauro Carvalho Chehab
Родитель
3b23db39b4
Коммит
83cb9a504c
|
|
@ -39,7 +39,7 @@ struct usb_isoc_ctl {
|
||||||
int pos, size, pktsize;
|
int pos, size, pktsize;
|
||||||
|
|
||||||
/* Last field: ODD or EVEN? */
|
/* Last field: ODD or EVEN? */
|
||||||
int field;
|
int vfield;
|
||||||
|
|
||||||
/* Stores incomplete commands */
|
/* Stores incomplete commands */
|
||||||
u32 tmp_buf;
|
u32 tmp_buf;
|
||||||
|
|
@ -47,7 +47,4 @@ struct usb_isoc_ctl {
|
||||||
|
|
||||||
/* Stores already requested buffers */
|
/* Stores already requested buffers */
|
||||||
struct tm6000_buffer *buf;
|
struct tm6000_buffer *buf;
|
||||||
|
|
||||||
/* Stores the number of received fields */
|
|
||||||
int nfields;
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -186,236 +186,148 @@ const char *tm6000_msg_type[] = {
|
||||||
/*
|
/*
|
||||||
* Identify the tm5600/6000 buffer header type and properly handles
|
* Identify the tm5600/6000 buffer header type and properly handles
|
||||||
*/
|
*/
|
||||||
static int copy_packet(struct urb *urb, u32 header, u8 **ptr, u8 *endp,
|
|
||||||
u8 *out_p, struct tm6000_buffer **buf)
|
|
||||||
{
|
|
||||||
struct tm6000_dmaqueue *dma_q = urb->context;
|
|
||||||
struct tm6000_core *dev = container_of(dma_q, struct tm6000_core, vidq);
|
|
||||||
u8 c;
|
|
||||||
unsigned int cmd, cpysize, pktsize, size, field, block, line, pos = 0;
|
|
||||||
int rc = 0;
|
|
||||||
/* FIXME: move to tm6000-isoc */
|
|
||||||
static int last_line = -2, start_line = -2, last_field = -2;
|
|
||||||
|
|
||||||
/* FIXME: this is the hardcoded window size
|
|
||||||
*/
|
|
||||||
unsigned int linewidth = (*buf)->vb.width << 1;
|
|
||||||
|
|
||||||
if (!dev->isoc_ctl.cmd) {
|
|
||||||
c = (header >> 24) & 0xff;
|
|
||||||
|
|
||||||
/* split the header fields */
|
|
||||||
size = ((header & 0x7e) << 1);
|
|
||||||
|
|
||||||
if (size > 0)
|
|
||||||
size -= 4;
|
|
||||||
|
|
||||||
block = (header >> 7) & 0xf;
|
|
||||||
field = (header >> 11) & 0x1;
|
|
||||||
line = (header >> 12) & 0x1ff;
|
|
||||||
cmd = (header >> 21) & 0x7;
|
|
||||||
|
|
||||||
/* Validates header fields */
|
|
||||||
if(size > TM6000_URB_MSG_LEN)
|
|
||||||
size = TM6000_URB_MSG_LEN;
|
|
||||||
|
|
||||||
if (cmd == TM6000_URB_MSG_VIDEO) {
|
|
||||||
if ((block+1)*TM6000_URB_MSG_LEN>linewidth)
|
|
||||||
cmd = TM6000_URB_MSG_ERR;
|
|
||||||
|
|
||||||
/* FIXME: Mounts the image as field0+field1
|
|
||||||
* It should, instead, check if the user selected
|
|
||||||
* entrelaced or non-entrelaced mode
|
|
||||||
*/
|
|
||||||
pos = ((line << 1) - field - 1) * linewidth +
|
|
||||||
block * TM6000_URB_MSG_LEN;
|
|
||||||
|
|
||||||
/* Don't allow to write out of the buffer */
|
|
||||||
if (pos+TM6000_URB_MSG_LEN > (*buf)->vb.size) {
|
|
||||||
dprintk(dev, V4L2_DEBUG_ISOC,
|
|
||||||
"ERR: size=%d, num=%d, line=%d, "
|
|
||||||
"field=%d\n",
|
|
||||||
size, block, line, field);
|
|
||||||
|
|
||||||
cmd = TM6000_URB_MSG_ERR;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
pos=0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Prints debug info */
|
|
||||||
dprintk(dev, V4L2_DEBUG_ISOC, "size=%d, num=%d, "
|
|
||||||
" line=%d, field=%d\n",
|
|
||||||
size, block, line, field);
|
|
||||||
|
|
||||||
if ((last_line!=line)&&(last_line+1!=line) &&
|
|
||||||
(cmd != TM6000_URB_MSG_ERR) ) {
|
|
||||||
if (cmd != TM6000_URB_MSG_VIDEO) {
|
|
||||||
dprintk(dev, V4L2_DEBUG_ISOC, "cmd=%d, "
|
|
||||||
"size=%d, num=%d, line=%d, field=%d\n",
|
|
||||||
cmd, size, block, line, field);
|
|
||||||
}
|
|
||||||
if (start_line<0)
|
|
||||||
start_line=last_line;
|
|
||||||
/* Prints debug info */
|
|
||||||
dprintk(dev, V4L2_DEBUG_ISOC, "lines= %d-%d, "
|
|
||||||
"field=%d\n",
|
|
||||||
start_line, last_line, field);
|
|
||||||
|
|
||||||
if ((start_line<6 && last_line>200) &&
|
|
||||||
(last_field != field) ) {
|
|
||||||
|
|
||||||
dev->isoc_ctl.nfields++;
|
|
||||||
if (dev->isoc_ctl.nfields>=2) {
|
|
||||||
dev->isoc_ctl.nfields=0;
|
|
||||||
|
|
||||||
/* Announces that a new buffer were filled */
|
|
||||||
buffer_filled (dev, dma_q, *buf);
|
|
||||||
dprintk(dev, V4L2_DEBUG_ISOC,
|
|
||||||
"new buffer filled\n");
|
|
||||||
get_next_buf (dma_q, buf);
|
|
||||||
if (!*buf)
|
|
||||||
return rc;
|
|
||||||
out_p = videobuf_to_vmalloc(&((*buf)->vb));
|
|
||||||
if (!out_p)
|
|
||||||
return rc;
|
|
||||||
|
|
||||||
pos = dev->isoc_ctl.pos = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
start_line=line;
|
|
||||||
last_field=field;
|
|
||||||
}
|
|
||||||
if (cmd == TM6000_URB_MSG_VIDEO)
|
|
||||||
last_line = line;
|
|
||||||
|
|
||||||
pktsize = TM6000_URB_MSG_LEN;
|
|
||||||
} else {
|
|
||||||
/* Continue the last copy */
|
|
||||||
cmd = dev->isoc_ctl.cmd;
|
|
||||||
size= dev->isoc_ctl.size;
|
|
||||||
pos = dev->isoc_ctl.pos;
|
|
||||||
pktsize = dev->isoc_ctl.pktsize;
|
|
||||||
}
|
|
||||||
|
|
||||||
cpysize = (endp-(*ptr) > size) ? size : endp - *ptr;
|
|
||||||
|
|
||||||
if (cpysize) {
|
|
||||||
/* handles each different URB message */
|
|
||||||
switch(cmd) {
|
|
||||||
case TM6000_URB_MSG_VIDEO:
|
|
||||||
/* Fills video buffer */
|
|
||||||
memcpy(&out_p[pos], *ptr, cpysize);
|
|
||||||
break;
|
|
||||||
case TM6000_URB_MSG_PTS:
|
|
||||||
break;
|
|
||||||
case TM6000_URB_MSG_AUDIO:
|
|
||||||
/* Need some code to process audio */
|
|
||||||
printk ("%ld: cmd=%s, size=%d\n", jiffies,
|
|
||||||
tm6000_msg_type[cmd],size);
|
|
||||||
break;
|
|
||||||
case TM6000_URB_MSG_VBI:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
dprintk (dev, V4L2_DEBUG_ISOC, "cmd=%s, size=%d\n",
|
|
||||||
tm6000_msg_type[cmd],size);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (cpysize<size) {
|
|
||||||
/* End of URB packet, but cmd processing is not
|
|
||||||
* complete. Preserve the state for a next packet
|
|
||||||
*/
|
|
||||||
dev->isoc_ctl.pos = pos+cpysize;
|
|
||||||
dev->isoc_ctl.size= size-cpysize;
|
|
||||||
dev->isoc_ctl.cmd = cmd;
|
|
||||||
dev->isoc_ctl.pktsize = pktsize-cpysize;
|
|
||||||
(*ptr)+=cpysize;
|
|
||||||
} else {
|
|
||||||
dev->isoc_ctl.cmd = 0;
|
|
||||||
(*ptr)+=pktsize;
|
|
||||||
}
|
|
||||||
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int copy_streams(u8 *data, unsigned long len,
|
static int copy_streams(u8 *data, unsigned long len,
|
||||||
struct urb *urb)
|
struct urb *urb)
|
||||||
{
|
{
|
||||||
struct tm6000_dmaqueue *dma_q = urb->context;
|
struct tm6000_dmaqueue *dma_q = urb->context;
|
||||||
struct tm6000_core *dev= container_of(dma_q,struct tm6000_core,vidq);
|
struct tm6000_core *dev= container_of(dma_q,struct tm6000_core,vidq);
|
||||||
u8 *ptr=data, *endp=data+len;
|
u8 *ptr=data, *endp=data+len, c;
|
||||||
unsigned long header=0;
|
unsigned long header=0;
|
||||||
int rc=0;
|
int rc=0;
|
||||||
struct tm6000_buffer *buf;
|
unsigned int cmd, cpysize, pktsize, size, field, block, line, pos = 0;
|
||||||
char *outp = NULL;
|
struct tm6000_buffer *vbuf;
|
||||||
|
char *voutp = NULL;
|
||||||
|
unsigned int linewidth;
|
||||||
|
|
||||||
get_next_buf(dma_q, &buf);
|
/* get video buffer */
|
||||||
if (buf)
|
get_next_buf (dma_q, &vbuf);
|
||||||
outp = videobuf_to_vmalloc(&buf->vb);
|
if (!vbuf)
|
||||||
|
return rc;
|
||||||
if (!outp)
|
voutp = videobuf_to_vmalloc(&vbuf->vb);
|
||||||
|
if (!voutp)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (ptr=data; ptr<endp;) {
|
for (ptr = data; ptr < endp;) {
|
||||||
if (!dev->isoc_ctl.cmd) {
|
if (!dev->isoc_ctl.cmd) {
|
||||||
u8 *p=(u8 *)&dev->isoc_ctl.tmp_buf;
|
/* Header */
|
||||||
/* FIXME: This seems very complex
|
if (dev->isoc_ctl.tmp_buf_len > 0) {
|
||||||
* It just recovers up to 3 bytes of the header that
|
/* from last urb or packet */
|
||||||
* might be at the previous packet
|
header = dev->isoc_ctl.tmp_buf;
|
||||||
*/
|
if (4 - dev->isoc_ctl.tmp_buf_len > 0) {
|
||||||
if (dev->isoc_ctl.tmp_buf_len) {
|
memcpy ((u8 *)&header +
|
||||||
while (dev->isoc_ctl.tmp_buf_len) {
|
|
||||||
if ( *(ptr+3-dev->isoc_ctl.tmp_buf_len) == 0x47) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
p++;
|
|
||||||
dev->isoc_ctl.tmp_buf_len--;
|
|
||||||
}
|
|
||||||
if (dev->isoc_ctl.tmp_buf_len) {
|
|
||||||
memcpy(&header, p,
|
|
||||||
dev->isoc_ctl.tmp_buf_len);
|
|
||||||
memcpy((u8 *)&header +
|
|
||||||
dev->isoc_ctl.tmp_buf_len,
|
dev->isoc_ctl.tmp_buf_len,
|
||||||
ptr,
|
ptr,
|
||||||
4 - dev->isoc_ctl.tmp_buf_len);
|
4 - dev->isoc_ctl.tmp_buf_len);
|
||||||
ptr += 4 - dev->isoc_ctl.tmp_buf_len;
|
ptr += 4 - dev->isoc_ctl.tmp_buf_len;
|
||||||
goto HEADER;
|
|
||||||
}
|
}
|
||||||
|
dev->isoc_ctl.tmp_buf_len = 0;
|
||||||
|
} else {
|
||||||
|
if (ptr + 3 >= endp) {
|
||||||
|
/* have incomplete header */
|
||||||
|
dev->isoc_ctl.tmp_buf_len = endp - ptr;
|
||||||
|
memcpy (&dev->isoc_ctl.tmp_buf, ptr,
|
||||||
|
dev->isoc_ctl.tmp_buf_len);
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
/* Seek for sync */
|
||||||
|
for (; ptr < endp - 3; ptr++) {
|
||||||
|
if (*(ptr + 3) == 0x47)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
/* Get message header */
|
||||||
|
header = *(unsigned long *)ptr;
|
||||||
|
ptr += 4;
|
||||||
}
|
}
|
||||||
/* Seek for sync */
|
/* split the header fields */
|
||||||
for (;ptr<endp-3;ptr++) {
|
c = (header >> 24) & 0xff;
|
||||||
if (*(ptr+3)==0x47)
|
size = ((header & 0x7e) << 1);
|
||||||
break;
|
if (size > 0)
|
||||||
|
size -= 4;
|
||||||
|
block = (header >> 7) & 0xf;
|
||||||
|
field = (header >> 11) & 0x1;
|
||||||
|
line = (header >> 12) & 0x1ff;
|
||||||
|
cmd = (header >> 21) & 0x7;
|
||||||
|
/* Validates haeder fields */
|
||||||
|
if (size > TM6000_URB_MSG_LEN)
|
||||||
|
size = TM6000_URB_MSG_LEN;
|
||||||
|
pktsize = TM6000_URB_MSG_LEN;
|
||||||
|
/* calculate position in buffer
|
||||||
|
* and change the buffer
|
||||||
|
*/
|
||||||
|
switch (cmd) {
|
||||||
|
case TM6000_URB_MSG_VIDEO:
|
||||||
|
if ((dev->isoc_ctl.vfield != field) &&
|
||||||
|
(field == 1)) {
|
||||||
|
/* Announces that a new buffer
|
||||||
|
* were filled
|
||||||
|
*/
|
||||||
|
buffer_filled (dev, dma_q, vbuf);
|
||||||
|
dprintk (dev, V4L2_DEBUG_ISOC,
|
||||||
|
"new buffer filled\n");
|
||||||
|
get_next_buf (dma_q, &vbuf);
|
||||||
|
if (!vbuf)
|
||||||
|
return rc;
|
||||||
|
voutp = videobuf_to_vmalloc (&vbuf->vb);
|
||||||
|
if (!voutp)
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
linewidth = vbuf->vb.width << 1;
|
||||||
|
pos = ((line << 1) - field - 1) * linewidth +
|
||||||
|
block * TM6000_URB_MSG_LEN;
|
||||||
|
/* Don't allow to write out of the buffer */
|
||||||
|
if (pos + size > vbuf->vb.size)
|
||||||
|
cmd = TM6000_URB_MSG_ERR;
|
||||||
|
dev->isoc_ctl.vfield = field;
|
||||||
|
break;
|
||||||
|
case TM6000_URB_MSG_AUDIO:
|
||||||
|
case TM6000_URB_MSG_VBI:
|
||||||
|
case TM6000_URB_MSG_PTS:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
if (ptr+3>=endp) {
|
/* Continue the last copy */
|
||||||
dev->isoc_ctl.tmp_buf_len=endp-ptr;
|
cmd = dev->isoc_ctl.cmd;
|
||||||
memcpy (&dev->isoc_ctl.tmp_buf,ptr,
|
size = dev->isoc_ctl.size;
|
||||||
dev->isoc_ctl.tmp_buf_len);
|
pos = dev->isoc_ctl.pos;
|
||||||
dev->isoc_ctl.cmd=0;
|
pktsize = dev->isoc_ctl.pktsize;
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Get message header */
|
|
||||||
header=*(unsigned long *)ptr;
|
|
||||||
ptr+=4;
|
|
||||||
}
|
}
|
||||||
HEADER:
|
cpysize = (endp - ptr > size) ? size : endp - ptr;
|
||||||
/* Copy or continue last copy */
|
if (cpysize) {
|
||||||
rc=copy_packet(urb,header,&ptr,endp,outp,&buf);
|
/* copy data in different buffers */
|
||||||
if (rc<0) {
|
switch (cmd) {
|
||||||
buf=NULL;
|
case TM6000_URB_MSG_VIDEO:
|
||||||
printk(KERN_ERR "tm6000: buffer underrun at %ld\n",
|
/* Fills video buffer */
|
||||||
jiffies);
|
if (vbuf)
|
||||||
return rc;
|
memcpy (&voutp[pos], ptr, cpysize);
|
||||||
|
break;
|
||||||
|
case TM6000_URB_MSG_AUDIO:
|
||||||
|
/* Need some code to copy audio buffer */
|
||||||
|
break;
|
||||||
|
case TM6000_URB_MSG_VBI:
|
||||||
|
/* Need some code to copy vbi buffer */
|
||||||
|
break;
|
||||||
|
case TM6000_URB_MSG_PTS:
|
||||||
|
/* Need some code to copy pts */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ptr + pktsize > endp) {
|
||||||
|
/* End of URB packet, but cmd processing is not
|
||||||
|
* complete. Preserve the state for a next packet
|
||||||
|
*/
|
||||||
|
dev->isoc_ctl.pos = pos + cpysize;
|
||||||
|
dev->isoc_ctl.size = size - cpysize;
|
||||||
|
dev->isoc_ctl.cmd = cmd;
|
||||||
|
dev->isoc_ctl.pktsize = pktsize - (endp - ptr);
|
||||||
|
ptr += endp - ptr;
|
||||||
|
} else {
|
||||||
|
dev->isoc_ctl.cmd = 0;
|
||||||
|
ptr += pktsize;
|
||||||
}
|
}
|
||||||
if (!buf)
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Identify the tm5600/6000 buffer header type and properly handles
|
* Identify the tm5600/6000 buffer header type and properly handles
|
||||||
*/
|
*/
|
||||||
|
|
@ -510,7 +422,6 @@ static inline int tm6000_isoc_copy(struct urb *urb)
|
||||||
{
|
{
|
||||||
struct tm6000_dmaqueue *dma_q = urb->context;
|
struct tm6000_dmaqueue *dma_q = urb->context;
|
||||||
struct tm6000_core *dev= container_of(dma_q,struct tm6000_core,vidq);
|
struct tm6000_core *dev= container_of(dma_q,struct tm6000_core,vidq);
|
||||||
struct tm6000_buffer *buf;
|
|
||||||
int i, len=0, rc=1, status;
|
int i, len=0, rc=1, status;
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
|
|
@ -585,7 +496,6 @@ static void tm6000_uninit_isoc(struct tm6000_core *dev)
|
||||||
struct urb *urb;
|
struct urb *urb;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
dev->isoc_ctl.nfields = -1;
|
|
||||||
dev->isoc_ctl.buf = NULL;
|
dev->isoc_ctl.buf = NULL;
|
||||||
for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
|
for (i = 0; i < dev->isoc_ctl.num_bufs; i++) {
|
||||||
urb=dev->isoc_ctl.urb[i];
|
urb=dev->isoc_ctl.urb[i];
|
||||||
|
|
@ -610,8 +520,6 @@ static void tm6000_uninit_isoc(struct tm6000_core *dev)
|
||||||
dev->isoc_ctl.urb=NULL;
|
dev->isoc_ctl.urb=NULL;
|
||||||
dev->isoc_ctl.transfer_buffer=NULL;
|
dev->isoc_ctl.transfer_buffer=NULL;
|
||||||
dev->isoc_ctl.num_bufs = 0;
|
dev->isoc_ctl.num_bufs = 0;
|
||||||
|
|
||||||
dev->isoc_ctl.num_bufs=0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче