diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-04-23 19:33:00 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2009-04-23 19:33:00 +0200 |
| commit | b82ff2ac55f0e0ab4af0426465514aced6c5db24 (patch) | |
| tree | d54c3460459acc496248efc85446942c1323b7a2 /linux/drivers/media/video/gspca/spca500.c | |
| parent | 44d5135c991fe67dafe83b30bbadddd586a63fe4 (diff) | |
| download | mediapointer-dvb-s2-b82ff2ac55f0e0ab4af0426465514aced6c5db24.tar.gz mediapointer-dvb-s2-b82ff2ac55f0e0ab4af0426465514aced6c5db24.tar.bz2 | |
gspca - spca500 and sunplus: Change the 0x00 insertion mechanism.
From: Jean-Francois Moine <moinejf@free.fr>
The new mechanism does not use any temporary buffer.
Priority: normal
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/video/gspca/spca500.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/spca500.c | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/linux/drivers/media/video/gspca/spca500.c b/linux/drivers/media/video/gspca/spca500.c index 8cfb7cad9..9717da6af 100644 --- a/linux/drivers/media/video/gspca/spca500.c +++ b/linux/drivers/media/video/gspca/spca500.c @@ -32,9 +32,6 @@ MODULE_LICENSE("GPL"); struct sd { struct gspca_dev gspca_dev; /* !! must be the first item */ - __u8 packet[ISO_MAX_SIZE + 128]; - /* !! no more than 128 ff in an ISO packet */ - unsigned char brightness; unsigned char contrast; unsigned char colors; @@ -923,7 +920,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, { struct sd *sd = (struct sd *) gspca_dev; int i; - __u8 *s, *d; static __u8 ffd9[] = {0xff, 0xd9}; /* frames are jpeg 4.1.1 without 0xff escape */ @@ -947,22 +943,19 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, } /* add 0x00 after 0xff */ - for (i = len; --i >= 0; ) - if (data[i] == 0xff) - break; - if (i < 0) { /* no 0xff */ - gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); - return; - } - s = data; - d = sd->packet; - for (i = 0; i < len; i++) { - *d++ = *s++; - if (s[-1] == 0xff) - *d++ = 0x00; - } - gspca_frame_add(gspca_dev, INTER_PACKET, frame, - sd->packet, d - sd->packet); + i = 0; + do { + if (data[i] == 0xff) { + gspca_frame_add(gspca_dev, INTER_PACKET, frame, + data, i + 1); + len -= i; + data += i; + *data = 0x00; + i = 0; + } + i++; + } while (i < len); + gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); } static void setbrightness(struct gspca_dev *gspca_dev) |