V4L/DVB (8675): gspca: Pixmap PJPG (Pixart 73xx JPEG) added, generated by pac7311.
The JPEG frames generated by the Pixart 73xx have: - special markers 'ff ff ff xx' every 1024/512 bytes, - unused 8 bits at end of JPEG blocks, and then ask for a new pixel format. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Jean-Francois Moine
Mauro Carvalho Chehab
parent
6ab0b174d2
commit
f75c4950bb
2 changed files with 10 additions and 191 deletions
|
|
@ -22,6 +22,7 @@
|
|||
#define MODULE_NAME "pac7311"
|
||||
|
||||
#include "gspca.h"
|
||||
#include "jpeg.h"
|
||||
|
||||
MODULE_AUTHOR("Thomas Kaiser thomas@kaiser-linux.li");
|
||||
MODULE_DESCRIPTION("Pixart PAC7311");
|
||||
|
|
@ -40,7 +41,6 @@ struct sd {
|
|||
unsigned char colors;
|
||||
unsigned char autogain;
|
||||
|
||||
char ffnb; /* number of 'ff' in the previous frame */
|
||||
char tosof; /* number of bytes before next start of frame */
|
||||
signed char ag_cnt;
|
||||
#define AG_CNT_START 13
|
||||
|
|
@ -121,95 +121,23 @@ static struct ctrl sd_ctrls[] = {
|
|||
};
|
||||
|
||||
static struct v4l2_pix_format vga_mode[] = {
|
||||
{160, 120, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
|
||||
{160, 120, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
|
||||
.bytesperline = 160,
|
||||
.sizeimage = 160 * 120 * 3 / 8 + 590,
|
||||
.colorspace = V4L2_COLORSPACE_JPEG,
|
||||
.priv = 2},
|
||||
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
|
||||
{320, 240, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
|
||||
.bytesperline = 320,
|
||||
.sizeimage = 320 * 240 * 3 / 8 + 590,
|
||||
.colorspace = V4L2_COLORSPACE_JPEG,
|
||||
.priv = 1},
|
||||
{640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
|
||||
{640, 480, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
|
||||
.bytesperline = 640,
|
||||
.sizeimage = 640 * 480 * 3 / 8 + 590,
|
||||
.colorspace = V4L2_COLORSPACE_JPEG,
|
||||
.priv = 0},
|
||||
};
|
||||
|
||||
#define PAC7311_JPEG_HEADER_SIZE (sizeof pac7311_jpeg_header) /* (594) */
|
||||
|
||||
static const __u8 pac7311_jpeg_header[] = {
|
||||
0xff, 0xd8,
|
||||
0xff, 0xe0, 0x00, 0x03, 0x20,
|
||||
0xff, 0xc0, 0x00, 0x11, 0x08,
|
||||
0x01, 0xe0, /* 12: height */
|
||||
0x02, 0x80, /* 14: width */
|
||||
0x03, /* 16 */
|
||||
0x01, 0x21, 0x00,
|
||||
0x02, 0x11, 0x01,
|
||||
0x03, 0x11, 0x01,
|
||||
0xff, 0xdb, 0x00, 0x84,
|
||||
0x00, 0x10, 0x0b, 0x0c, 0x0e, 0x0c, 0x0a, 0x10, 0x0e, 0x0d,
|
||||
0x0e, 0x12, 0x11, 0x10, 0x13, 0x18, 0x28, 0x1a, 0x18, 0x16,
|
||||
0x16, 0x18, 0x31, 0x23, 0x25, 0x1d, 0x28, 0x3a, 0x33, 0x3d,
|
||||
0x3c, 0x39, 0x33, 0x38, 0x37, 0x40, 0x48, 0x5c, 0x4e, 0x40,
|
||||
0x44, 0x57, 0x45, 0x37, 0x38, 0x50, 0x6d, 0x51, 0x57, 0x5f,
|
||||
0x62, 0x67, 0x68, 0x67, 0x3e, 0x4d, 0x71, 0x79, 0x70, 0x64,
|
||||
0x78, 0x5c, 0x65, 0x67, 0x63, 0x01, 0x11, 0x12, 0x12, 0x18,
|
||||
0x15, 0x18, 0x2f, 0x1a, 0x1a, 0x2f, 0x63, 0x42, 0x38, 0x42,
|
||||
0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
|
||||
0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
|
||||
0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
|
||||
0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
|
||||
0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63, 0x63,
|
||||
0xff, 0xc4, 0x01, 0xa2, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01,
|
||||
0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
|
||||
0x09, 0x0a, 0x0b, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02,
|
||||
0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,
|
||||
0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31,
|
||||
0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32,
|
||||
0x81, 0x91, 0xa1, 0x08, 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52,
|
||||
0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
|
||||
0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a,
|
||||
0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45,
|
||||
0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57,
|
||||
0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
|
||||
0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x83,
|
||||
0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94,
|
||||
0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
|
||||
0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
|
||||
0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
|
||||
0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
|
||||
0xd9, 0xda, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,
|
||||
0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
|
||||
0xf9, 0xfa, 0x01, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01,
|
||||
0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
|
||||
0x0b, 0x11, 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
|
||||
0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77, 0x00, 0x01,
|
||||
0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41,
|
||||
0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14,
|
||||
0x42, 0x91, 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
|
||||
0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25,
|
||||
0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, 0x27, 0x28, 0x29, 0x2a,
|
||||
0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46,
|
||||
0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
|
||||
0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a,
|
||||
0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x82, 0x83,
|
||||
0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94,
|
||||
0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
|
||||
0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
|
||||
0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
|
||||
0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
|
||||
0xd9, 0xda, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
|
||||
0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa,
|
||||
0xff, 0xda, 0x00, 0x0c, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03,
|
||||
0x11, 0x00, 0x3f, 0x00
|
||||
};
|
||||
|
||||
/* pac 7302 */
|
||||
static const __u8 probe_7302[] = {
|
||||
/* index,value */
|
||||
|
|
@ -566,7 +494,6 @@ static void sd_start(struct gspca_dev *gspca_dev)
|
|||
{
|
||||
struct sd *sd = (struct sd *) gspca_dev;
|
||||
|
||||
sd->ffnb = 0;
|
||||
sd->tosof = 0;
|
||||
|
||||
if (sd->sensor == SENSOR_PAC7302)
|
||||
|
|
@ -699,34 +626,6 @@ static void do_autogain(struct gspca_dev *gspca_dev)
|
|||
}
|
||||
}
|
||||
|
||||
/* output the jpeg header */
|
||||
static void put_jpeg_head(struct gspca_dev *gspca_dev,
|
||||
struct gspca_frame *frame)
|
||||
{
|
||||
struct sd *sd = (struct sd *) gspca_dev;
|
||||
unsigned char tmpbuf[4];
|
||||
|
||||
if (sd->ag_cnt >= 0) {
|
||||
if (--sd->ag_cnt < 0) {
|
||||
sd->ag_cnt = AG_CNT_START;
|
||||
atomic_set(&sd->avg_lum, sd->lum_sum / AG_CNT_START);
|
||||
atomic_set(&sd->do_gain, 1);
|
||||
}
|
||||
}
|
||||
gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
|
||||
(__u8 *) pac7311_jpeg_header,
|
||||
12);
|
||||
tmpbuf[0] = gspca_dev->height >> 8;
|
||||
tmpbuf[1] = gspca_dev->height & 0xff;
|
||||
tmpbuf[2] = gspca_dev->width >> 8;
|
||||
tmpbuf[3] = gspca_dev->width & 0xff;
|
||||
gspca_frame_add(gspca_dev, INTER_PACKET, frame,
|
||||
tmpbuf, 4);
|
||||
gspca_frame_add(gspca_dev, INTER_PACKET, frame,
|
||||
(__u8 *) &pac7311_jpeg_header[16],
|
||||
PAC7311_JPEG_HEADER_SIZE - 16);
|
||||
}
|
||||
|
||||
/* this function is run at interrupt level */
|
||||
static void sd_pkt_scan(struct gspca_dev *gspca_dev,
|
||||
struct gspca_frame *frame, /* target */
|
||||
|
|
@ -739,24 +638,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
|
|||
#define INTER_FRAME 0x53 /* eof + inter frame + sof */
|
||||
#define LUM_OFFSET 0x1e /* reverse offset / start of frame */
|
||||
|
||||
/*fixme:test+*/
|
||||
/* dump the packet */
|
||||
if (gspca_debug & 0x200) {
|
||||
static char tmp[50];
|
||||
|
||||
PDEBUG(0x200, "pkt_scan");
|
||||
tmp[0] = 0;
|
||||
for (i = 0; i < len; i++) {
|
||||
if (i % 16 == 0 && i != 0) {
|
||||
PDEBUG(0x200, "%s", tmp);
|
||||
tmp[0] = 0;
|
||||
}
|
||||
sprintf(&tmp[(i % 16) * 3], "%02x ", data[i]);
|
||||
}
|
||||
if (tmp[0] != 0)
|
||||
PDEBUG(0x200, "%s", tmp);
|
||||
}
|
||||
/*fixme:test-*/
|
||||
/*
|
||||
* inside a frame, there may be:
|
||||
* escaped ff ('ff 00')
|
||||
|
|
@ -767,47 +648,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
|
|||
* 0x33 bytes
|
||||
* one byte luminosity
|
||||
* 0x16 bytes
|
||||
* ff ff 00 ff 96 62 44 start of frame header
|
||||
* ff ff 00 ff 96 62 44 start of frame
|
||||
*/
|
||||
|
||||
if (sd->tosof == 0) { /* if inside a frame */
|
||||
|
||||
/* check for 'ff ff ff xx' at start and at end of packet */
|
||||
/* (len is always >= 3 and xx never ff) */
|
||||
switch (sd->ffnb) {
|
||||
case 1:
|
||||
if (data[0] != 0xff) { /* can be '00' only */
|
||||
__u8 ff;
|
||||
|
||||
sd->ffnb = 0;
|
||||
ff = 0xff;
|
||||
gspca_frame_add(gspca_dev, INTER_PACKET,
|
||||
frame, &ff, 1);
|
||||
break; /* keep 'ff 00' */
|
||||
}
|
||||
/* fall thru */
|
||||
case 2:
|
||||
case 3:
|
||||
data += 4 - sd->ffnb;
|
||||
len -= 4 - sd->ffnb;
|
||||
sd->ffnb = 0;
|
||||
break;
|
||||
}
|
||||
if (data[len - 1] == 0xff) {
|
||||
if (data[len - 2] == 0xff) {
|
||||
if (data[len - 3] == 0xff) {
|
||||
sd->ffnb = 3;
|
||||
len -= 3;
|
||||
} else {
|
||||
sd->ffnb = 2;
|
||||
len -= 2;
|
||||
}
|
||||
} else {
|
||||
sd->ffnb = 1;
|
||||
len--;
|
||||
}
|
||||
}
|
||||
} else { /* outside a frame */
|
||||
if (sd->tosof != 0) { /* if outside a frame */
|
||||
|
||||
/* get the luminosity and go to the start of frame */
|
||||
data += sd->tosof;
|
||||
|
|
@ -815,14 +659,14 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
|
|||
if (sd->tosof > LUM_OFFSET)
|
||||
sd->lum_sum += data[-LUM_OFFSET];
|
||||
sd->tosof = 0;
|
||||
put_jpeg_head(gspca_dev, frame);
|
||||
jpeg_put_header(gspca_dev, frame, 1, 0x21);
|
||||
}
|
||||
|
||||
for (i = 0; i < len; i++) {
|
||||
if (data[i] != 0xff)
|
||||
continue;
|
||||
switch (data[i + 1]) {
|
||||
case 0xd9: /* end of frame */
|
||||
case 0xd9: /* 'ff d9' end of frame */
|
||||
frame = gspca_frame_add(gspca_dev,
|
||||
LAST_PACKET,
|
||||
frame, data, i + 2);
|
||||
|
|
@ -835,33 +679,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
|
|||
sd->tosof = -len;
|
||||
break;
|
||||
}
|
||||
put_jpeg_head(gspca_dev, frame);
|
||||
break;
|
||||
case 0xff: /* 'ff ff ff xx' */
|
||||
/*fixme:test+*/
|
||||
/* is there a start of frame ? */
|
||||
if (data[i + 2] == 0x00) {
|
||||
static __u8 ffd9[2] = {0xff, 0xd9};
|
||||
|
||||
gspca_frame_add(gspca_dev,
|
||||
INTER_PACKET,
|
||||
frame, data,
|
||||
i + 7 - INTER_FRAME);
|
||||
frame = gspca_frame_add(gspca_dev,
|
||||
LAST_PACKET,
|
||||
frame, ffd9, 2);
|
||||
data += i + 7;
|
||||
len -= i + 7;
|
||||
i = 0;
|
||||
put_jpeg_head(gspca_dev, frame);
|
||||
break;
|
||||
}
|
||||
/*fixme:test-*/
|
||||
gspca_frame_add(gspca_dev, INTER_PACKET,
|
||||
frame, data, i);
|
||||
data += i + 4;
|
||||
len -= i + 4;
|
||||
i = 0;
|
||||
jpeg_put_header(gspca_dev, frame, 1, 0x21);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -334,6 +334,7 @@ struct v4l2_pix_format {
|
|||
#define V4L2_PIX_FMT_SPCA508 v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
|
||||
#define V4L2_PIX_FMT_SPCA561 v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
|
||||
#define V4L2_PIX_FMT_PAC207 v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
|
||||
#define V4L2_PIX_FMT_PJPG v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
|
||||
|
||||
/*
|
||||
* F O R M A T E N U M E R A T I O N
|
||||
|
|
|
|||
Loading…
Reference in a new issue