aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sonixj.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-01-07 14:49:57 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:30 -0400
commit36e819db435a61819d50c57c424a5ab2b9634e59 (patch)
tree298bc85147b5fb60eaf5e6ecb745382a9a3580fa /drivers/media/video/gspca/sonixj.c
parent96ff65144c3e302698d6c53b8d05098844c6b064 (diff)
V4L/DVB (10345): gspca - jpeg subdrivers: One quantization table per subdriver.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/sonixj.c')
-rw-r--r--drivers/media/video/gspca/sonixj.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 755ca302368e..51d68d35aa73 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -22,6 +22,7 @@
22#define MODULE_NAME "sonixj" 22#define MODULE_NAME "sonixj"
23 23
24#include "gspca.h" 24#include "gspca.h"
25#define QUANT_VAL 4 /* quantization table */
25#include "jpeg.h" 26#include "jpeg.h"
26 27
27#define V4L2_CID_INFRARED (V4L2_CID_PRIVATE_BASE + 0) 28#define V4L2_CID_INFRARED (V4L2_CID_PRIVATE_BASE + 0)
@@ -49,7 +50,6 @@ struct sd {
49 __s8 ag_cnt; 50 __s8 ag_cnt;
50#define AG_CNT_START 13 51#define AG_CNT_START 13
51 52
52 __u8 qindex;
53 __u8 bridge; 53 __u8 bridge;
54#define BRIDGE_SN9C102P 0 54#define BRIDGE_SN9C102P 0
55#define BRIDGE_SN9C105 1 55#define BRIDGE_SN9C105 1
@@ -1025,7 +1025,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
1025 sd->sensor = id->driver_info >> 8; 1025 sd->sensor = id->driver_info >> 8;
1026 sd->i2c_base = id->driver_info; 1026 sd->i2c_base = id->driver_info;
1027 1027
1028 sd->qindex = 4; /* set the quantization table */
1029 sd->brightness = BRIGHTNESS_DEF; 1028 sd->brightness = BRIGHTNESS_DEF;
1030 sd->contrast = CONTRAST_DEF; 1029 sd->contrast = CONTRAST_DEF;
1031 sd->colors = COLOR_DEF; 1030 sd->colors = COLOR_DEF;
@@ -1549,7 +1548,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
1549 if (gspca_dev->last_packet_type == LAST_PACKET) { 1548 if (gspca_dev->last_packet_type == LAST_PACKET) {
1550 1549
1551 /* put the JPEG 422 header */ 1550 /* put the JPEG 422 header */
1552 jpeg_put_header(gspca_dev, frame, sd->qindex, 0x21); 1551 jpeg_put_header(gspca_dev, frame, 0x21);
1553 } 1552 }
1554 gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); 1553 gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
1555} 1554}