Index: jdmarker.c |
=================================================================== |
--- jdmarker.c (revision 83675) |
+++ jdmarker.c (working copy) |
@@ -940,7 +940,144 @@ |
return TRUE; |
} |
+#ifdef MOTION_JPEG_SUPPORTED |
+/* The default Huffman tables used by motion JPEG frames. When a motion JPEG |
+ * frame does not have DHT tables, we should use the huffman tables suggested by |
+ * the JPEG standard. Each of these tables represents a member of the JHUFF_TBLS |
+ * struct so we can just copy it to the according JHUFF_TBLS member. |
+ */ |
+/* DC table 0 */ |
+LOCAL(const unsigned char) mjpg_dc0_bits[] = { |
+ 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, |
+ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 |
+}; |
+ |
+LOCAL(const unsigned char) mjpg_dc0_huffval[] = { |
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, |
+ 0x08, 0x09, 0x0A, 0x0B |
+}; |
+ |
+/* DC table 1 */ |
+LOCAL(const unsigned char) mjpg_dc1_bits[] = { |
+ 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, |
+ 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 |
+}; |
+ |
+LOCAL(const unsigned char) mjpg_dc1_huffval[] = { |
+ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, |
+ 0x08, 0x09, 0x0A, 0x0B |
+}; |
+ |
+/* AC table 0 */ |
+LOCAL(const unsigned char) mjpg_ac0_bits[] = { |
+ 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03, |
+ 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7D |
+}; |
+ |
+LOCAL(const unsigned char) mjpg_ac0_huffval[] = { |
+ 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 |
+}; |
+ |
+/* AC table 1 */ |
+LOCAL(const unsigned char) mjpg_ac1_bits[] = { |
+ 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04, |
+ 0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77 |
+}; |
+ |
+LOCAL(const unsigned char) mjpg_ac1_huffval[] = { |
+ 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 |
+}; |
+ |
+/* Loads the default Huffman tables used by motion JPEG frames. This function |
+ * just copies the huffman tables suggested in the JPEG standard when we have |
+ * not load them. |
+ */ |
+LOCAL(void) |
+mjpg_load_huff_tables (j_decompress_ptr cinfo) |
+{ |
+ JHUFF_TBL *htblptr; |
+ |
+ if (! cinfo->dc_huff_tbl_ptrs[0]) { |
+ htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo); |
+ MEMZERO(htblptr, SIZEOF(JHUFF_TBL)); |
+ MEMCOPY(&htblptr->bits[1], mjpg_dc0_bits, SIZEOF(mjpg_dc0_bits)); |
+ MEMCOPY(&htblptr->huffval[0], mjpg_dc0_huffval, SIZEOF(mjpg_dc0_huffval)); |
+ cinfo->dc_huff_tbl_ptrs[0] = htblptr; |
+ } |
+ |
+ if (! cinfo->dc_huff_tbl_ptrs[1]) { |
+ htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo); |
+ MEMZERO(htblptr, SIZEOF(JHUFF_TBL)); |
+ MEMCOPY(&htblptr->bits[1], mjpg_dc1_bits, SIZEOF(mjpg_dc1_bits)); |
+ MEMCOPY(&htblptr->huffval[0], mjpg_dc1_huffval, SIZEOF(mjpg_dc1_huffval)); |
+ cinfo->dc_huff_tbl_ptrs[1] = htblptr; |
+ } |
+ |
+ if (! cinfo->ac_huff_tbl_ptrs[0]) { |
+ htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo); |
+ MEMZERO(htblptr, SIZEOF(JHUFF_TBL)); |
+ MEMCOPY(&htblptr->bits[1], mjpg_ac0_bits, SIZEOF(mjpg_ac0_bits)); |
+ MEMCOPY(&htblptr->huffval[0], mjpg_ac0_huffval, SIZEOF(mjpg_ac0_huffval)); |
+ cinfo->ac_huff_tbl_ptrs[0] = htblptr; |
+ } |
+ |
+ if (! cinfo->ac_huff_tbl_ptrs[1]) { |
+ htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo); |
+ MEMZERO(htblptr, SIZEOF(JHUFF_TBL)); |
+ MEMCOPY(&htblptr->bits[1], mjpg_ac1_bits, SIZEOF(mjpg_ac1_bits)); |
+ MEMCOPY(&htblptr->huffval[0], mjpg_ac1_huffval, SIZEOF(mjpg_ac1_huffval)); |
+ cinfo->ac_huff_tbl_ptrs[1] = htblptr; |
+ } |
+} |
+ |
+#else |
+ |
+#define mjpg_load_huff_tables(cinfo) |
+ |
+#endif /* MOTION_JPEG_SUPPORTED */ |
+ |
+ |
/* |
* Read markers until SOS or EOI. |
* |
@@ -1009,6 +1146,7 @@ |
break; |
case M_SOS: |
+ mjpg_load_huff_tables(cinfo); |
if (! get_sos(cinfo)) |
return JPEG_SUSPENDED; |
cinfo->unread_marker = 0; /* processed the marker */ |
Property changes on: jdmarker.c |
___________________________________________________________________ |
Added: svn:eol-style |
+ LF |