Mercurial > libavcodec.hg
annotate mjpeg.c @ 1276:d5719a953ee0 libavcodec
* compile fixes by Mitch at Bits.COM
author | kabi |
---|---|
date | Tue, 20 May 2003 17:36:49 +0000 |
parents | 61317ffc64d5 |
children | 8623c2e29555 |
rev | line source |
---|---|
0 | 1 /* |
23 | 2 * MJPEG encoder and decoder |
427 | 3 * Copyright (c) 2000, 2001 Fabrice Bellard. |
0 | 4 * |
427 | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
0 | 9 * |
427 | 10 * This library is distributed in the hope that it will be useful, |
0 | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
427 | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 * Lesser General Public License for more details. | |
0 | 14 * |
427 | 15 * You should have received a copy of the GNU Lesser General Public |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
18 * |
672 | 19 * Support for external huffman table, various fixes (AVID workaround), |
881 | 20 * aspecting, new decode_frame mechanism and apple mjpeg-b support |
672 | 21 * by Alex Beregszaszi <alex@naxine.org> |
0 | 22 */ |
1106 | 23 |
24 /** | |
25 * @file mjpeg.c | |
26 * MJPEG encoder and decoder. | |
27 */ | |
28 | |
776 | 29 //#define DEBUG |
0 | 30 #include "avcodec.h" |
31 #include "dsputil.h" | |
32 #include "mpegvideo.h" | |
33 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
34 /* use two quantizer tables (one for luminance and one for chrominance) */ |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
35 /* not yet working */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
36 #undef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
37 |
0 | 38 typedef struct MJpegContext { |
1064 | 39 uint8_t huff_size_dc_luminance[12]; |
40 uint16_t huff_code_dc_luminance[12]; | |
41 uint8_t huff_size_dc_chrominance[12]; | |
42 uint16_t huff_code_dc_chrominance[12]; | |
0 | 43 |
1064 | 44 uint8_t huff_size_ac_luminance[256]; |
45 uint16_t huff_code_ac_luminance[256]; | |
46 uint8_t huff_size_ac_chrominance[256]; | |
47 uint16_t huff_code_ac_chrominance[256]; | |
0 | 48 } MJpegContext; |
49 | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
50 /* JPEG marker codes */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
51 typedef enum { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
52 /* start of frame */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
53 SOF0 = 0xc0, /* baseline */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
54 SOF1 = 0xc1, /* extended sequential, huffman */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
55 SOF2 = 0xc2, /* progressive, huffman */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
56 SOF3 = 0xc3, /* lossless, huffman */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
57 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
58 SOF5 = 0xc5, /* differential sequential, huffman */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
59 SOF6 = 0xc6, /* differential progressive, huffman */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
60 SOF7 = 0xc7, /* differential lossless, huffman */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
61 JPG = 0xc8, /* reserved for JPEG extension */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
62 SOF9 = 0xc9, /* extended sequential, arithmetic */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
63 SOF10 = 0xca, /* progressive, arithmetic */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
64 SOF11 = 0xcb, /* lossless, arithmetic */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
65 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
66 SOF13 = 0xcd, /* differential sequential, arithmetic */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
67 SOF14 = 0xce, /* differential progressive, arithmetic */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
68 SOF15 = 0xcf, /* differential lossless, arithmetic */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
69 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
70 DHT = 0xc4, /* define huffman tables */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
71 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
72 DAC = 0xcc, /* define arithmetic-coding conditioning */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
73 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
74 /* restart with modulo 8 count "m" */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
75 RST0 = 0xd0, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
76 RST1 = 0xd1, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
77 RST2 = 0xd2, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
78 RST3 = 0xd3, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
79 RST4 = 0xd4, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
80 RST5 = 0xd5, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
81 RST6 = 0xd6, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
82 RST7 = 0xd7, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
83 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
84 SOI = 0xd8, /* start of image */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
85 EOI = 0xd9, /* end of image */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
86 SOS = 0xda, /* start of scan */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
87 DQT = 0xdb, /* define quantization tables */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
88 DNL = 0xdc, /* define number of lines */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
89 DRI = 0xdd, /* define restart interval */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
90 DHP = 0xde, /* define hierarchical progression */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
91 EXP = 0xdf, /* expand reference components */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
92 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
93 APP0 = 0xe0, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
94 APP1 = 0xe1, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
95 APP2 = 0xe2, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
96 APP3 = 0xe3, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
97 APP4 = 0xe4, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
98 APP5 = 0xe5, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
99 APP6 = 0xe6, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
100 APP7 = 0xe7, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
101 APP8 = 0xe8, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
102 APP9 = 0xe9, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
103 APP10 = 0xea, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
104 APP11 = 0xeb, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
105 APP12 = 0xec, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
106 APP13 = 0xed, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
107 APP14 = 0xee, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
108 APP15 = 0xef, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
109 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
110 JPG0 = 0xf0, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
111 JPG1 = 0xf1, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
112 JPG2 = 0xf2, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
113 JPG3 = 0xf3, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
114 JPG4 = 0xf4, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
115 JPG5 = 0xf5, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
116 JPG6 = 0xf6, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
117 JPG7 = 0xf7, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
118 JPG8 = 0xf8, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
119 JPG9 = 0xf9, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
120 JPG10 = 0xfa, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
121 JPG11 = 0xfb, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
122 JPG12 = 0xfc, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
123 JPG13 = 0xfd, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
124 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
125 COM = 0xfe, /* comment */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
126 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
127 TEM = 0x01, /* temporary private use for arithmetic coding */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
128 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
129 /* 0x02 -> 0xbf reserved */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
130 } JPEG_MARKER; |
0 | 131 |
132 #if 0 | |
133 /* These are the sample quantization tables given in JPEG spec section K.1. | |
134 * The spec says that the values given produce "good" quality, and | |
135 * when divided by 2, "very good" quality. | |
136 */ | |
137 static const unsigned char std_luminance_quant_tbl[64] = { | |
138 16, 11, 10, 16, 24, 40, 51, 61, | |
139 12, 12, 14, 19, 26, 58, 60, 55, | |
140 14, 13, 16, 24, 40, 57, 69, 56, | |
141 14, 17, 22, 29, 51, 87, 80, 62, | |
142 18, 22, 37, 56, 68, 109, 103, 77, | |
143 24, 35, 55, 64, 81, 104, 113, 92, | |
144 49, 64, 78, 87, 103, 121, 120, 101, | |
145 72, 92, 95, 98, 112, 100, 103, 99 | |
146 }; | |
147 static const unsigned char std_chrominance_quant_tbl[64] = { | |
148 17, 18, 24, 47, 99, 99, 99, 99, | |
149 18, 21, 26, 66, 99, 99, 99, 99, | |
150 24, 26, 56, 99, 99, 99, 99, 99, | |
151 47, 66, 99, 99, 99, 99, 99, 99, | |
152 99, 99, 99, 99, 99, 99, 99, 99, | |
153 99, 99, 99, 99, 99, 99, 99, 99, | |
154 99, 99, 99, 99, 99, 99, 99, 99, | |
155 99, 99, 99, 99, 99, 99, 99, 99 | |
156 }; | |
157 #endif | |
158 | |
159 /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ | |
160 /* IMPORTANT: these are only valid for 8-bit data precision! */ | |
1064 | 161 static const uint8_t bits_dc_luminance[17] = |
0 | 162 { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; |
1064 | 163 static const uint8_t val_dc_luminance[] = |
0 | 164 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; |
165 | |
1064 | 166 static const uint8_t bits_dc_chrominance[17] = |
0 | 167 { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; |
1064 | 168 static const uint8_t val_dc_chrominance[] = |
0 | 169 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; |
170 | |
1064 | 171 static const uint8_t bits_ac_luminance[17] = |
0 | 172 { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; |
1064 | 173 static const uint8_t val_ac_luminance[] = |
0 | 174 { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, |
175 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, | |
176 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, | |
177 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, | |
178 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, | |
179 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, | |
180 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, | |
181 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, | |
182 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, | |
183 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, | |
184 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, | |
185 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, | |
186 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, | |
187 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, | |
188 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, | |
189 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, | |
190 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, | |
191 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, | |
192 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, | |
193 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, | |
194 0xf9, 0xfa | |
195 }; | |
196 | |
1064 | 197 static const uint8_t bits_ac_chrominance[17] = |
0 | 198 { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; |
199 | |
1064 | 200 static const uint8_t val_ac_chrominance[] = |
0 | 201 { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, |
202 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, | |
203 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, | |
204 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, | |
205 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, | |
206 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, | |
207 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, | |
208 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, | |
209 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, | |
210 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, | |
211 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, | |
212 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, | |
213 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, | |
214 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, | |
215 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, | |
216 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, | |
217 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, | |
218 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, | |
219 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, | |
220 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, | |
221 0xf9, 0xfa | |
222 }; | |
223 | |
224 /* isn't this function nicer than the one in the libjpeg ? */ | |
1064 | 225 static void build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, |
226 const uint8_t *bits_table, const uint8_t *val_table) | |
0 | 227 { |
228 int i, j, k,nb, code, sym; | |
229 | |
230 code = 0; | |
231 k = 0; | |
232 for(i=1;i<=16;i++) { | |
233 nb = bits_table[i]; | |
234 for(j=0;j<nb;j++) { | |
235 sym = val_table[k++]; | |
236 huff_size[sym] = i; | |
237 huff_code[sym] = code; | |
238 code++; | |
239 } | |
240 code <<= 1; | |
241 } | |
242 } | |
243 | |
244 int mjpeg_init(MpegEncContext *s) | |
245 { | |
246 MJpegContext *m; | |
247 | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
248 m = av_malloc(sizeof(MJpegContext)); |
0 | 249 if (!m) |
250 return -1; | |
344 | 251 |
252 s->min_qcoeff=-1023; | |
253 s->max_qcoeff= 1023; | |
0 | 254 |
255 /* build all the huffman tables */ | |
256 build_huffman_codes(m->huff_size_dc_luminance, | |
257 m->huff_code_dc_luminance, | |
258 bits_dc_luminance, | |
259 val_dc_luminance); | |
260 build_huffman_codes(m->huff_size_dc_chrominance, | |
261 m->huff_code_dc_chrominance, | |
262 bits_dc_chrominance, | |
263 val_dc_chrominance); | |
264 build_huffman_codes(m->huff_size_ac_luminance, | |
265 m->huff_code_ac_luminance, | |
266 bits_ac_luminance, | |
267 val_ac_luminance); | |
268 build_huffman_codes(m->huff_size_ac_chrominance, | |
269 m->huff_code_ac_chrominance, | |
270 bits_ac_chrominance, | |
271 val_ac_chrominance); | |
272 | |
273 s->mjpeg_ctx = m; | |
274 return 0; | |
275 } | |
276 | |
277 void mjpeg_close(MpegEncContext *s) | |
278 { | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
279 av_free(s->mjpeg_ctx); |
0 | 280 } |
281 | |
282 static inline void put_marker(PutBitContext *p, int code) | |
283 { | |
284 put_bits(p, 8, 0xff); | |
285 put_bits(p, 8, code); | |
286 } | |
287 | |
288 /* table_class: 0 = DC coef, 1 = AC coefs */ | |
289 static int put_huffman_table(MpegEncContext *s, int table_class, int table_id, | |
1064 | 290 const uint8_t *bits_table, const uint8_t *value_table) |
0 | 291 { |
292 PutBitContext *p = &s->pb; | |
293 int n, i; | |
294 | |
295 put_bits(p, 4, table_class); | |
296 put_bits(p, 4, table_id); | |
297 | |
298 n = 0; | |
299 for(i=1;i<=16;i++) { | |
300 n += bits_table[i]; | |
301 put_bits(p, 8, bits_table[i]); | |
302 } | |
303 | |
304 for(i=0;i<n;i++) | |
305 put_bits(p, 8, value_table[i]); | |
306 | |
307 return n + 17; | |
308 } | |
309 | |
310 static void jpeg_table_header(MpegEncContext *s) | |
311 { | |
312 PutBitContext *p = &s->pb; | |
37 | 313 int i, j, size; |
1064 | 314 uint8_t *ptr; |
0 | 315 |
316 /* quant matrixes */ | |
317 put_marker(p, DQT); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
318 #ifdef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
319 put_bits(p, 16, 2 + 2 * (1 + 64)); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
320 #else |
0 | 321 put_bits(p, 16, 2 + 1 * (1 + 64)); |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
322 #endif |
0 | 323 put_bits(p, 4, 0); /* 8 bit precision */ |
324 put_bits(p, 4, 0); /* table 0 */ | |
325 for(i=0;i<64;i++) { | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
326 j = s->intra_scantable.permutated[i]; |
37 | 327 put_bits(p, 8, s->intra_matrix[j]); |
0 | 328 } |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
329 #ifdef TWOMATRIXES |
0 | 330 put_bits(p, 4, 0); /* 8 bit precision */ |
331 put_bits(p, 4, 1); /* table 1 */ | |
332 for(i=0;i<64;i++) { | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
333 j = s->intra_scantable.permutated[i]; |
37 | 334 put_bits(p, 8, s->chroma_intra_matrix[j]); |
0 | 335 } |
336 #endif | |
337 | |
338 /* huffman table */ | |
339 put_marker(p, DHT); | |
340 flush_put_bits(p); | |
234
5fc0c3af3fe4
alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents:
229
diff
changeset
|
341 ptr = pbBufPtr(p); |
0 | 342 put_bits(p, 16, 0); /* patched later */ |
343 size = 2; | |
344 size += put_huffman_table(s, 0, 0, bits_dc_luminance, val_dc_luminance); | |
345 size += put_huffman_table(s, 0, 1, bits_dc_chrominance, val_dc_chrominance); | |
346 | |
347 size += put_huffman_table(s, 1, 0, bits_ac_luminance, val_ac_luminance); | |
348 size += put_huffman_table(s, 1, 1, bits_ac_chrominance, val_ac_chrominance); | |
349 ptr[0] = size >> 8; | |
350 ptr[1] = size; | |
351 } | |
352 | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
353 static void jpeg_put_comments(MpegEncContext *s) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
354 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
355 PutBitContext *p = &s->pb; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
356 int size; |
1064 | 357 uint8_t *ptr; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
358 |
672 | 359 if (s->aspect_ratio_info) |
360 { | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
361 /* JFIF header */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
362 put_marker(p, APP0); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
363 put_bits(p, 16, 16); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
364 put_string(p, "JFIF"); /* this puts the trailing zero-byte too */ |
672 | 365 put_bits(p, 16, 0x0201); /* v 1.02 */ |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
366 put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ |
672 | 367 switch(s->aspect_ratio_info) |
368 { | |
369 case FF_ASPECT_4_3_625: | |
370 case FF_ASPECT_4_3_525: | |
371 put_bits(p, 16, 4); | |
372 put_bits(p, 16, 3); | |
373 break; | |
374 case FF_ASPECT_16_9_625: | |
375 case FF_ASPECT_16_9_525: | |
376 put_bits(p, 16, 16); | |
377 put_bits(p, 16, 9); | |
378 break; | |
379 case FF_ASPECT_EXTENDED: | |
380 put_bits(p, 16, s->aspected_width); | |
381 put_bits(p, 16, s->aspected_height); | |
382 break; | |
383 case FF_ASPECT_SQUARE: | |
384 default: | |
385 put_bits(p, 16, 1); /* aspect: 1:1 */ | |
386 put_bits(p, 16, 1); | |
387 break; | |
388 } | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
389 put_bits(p, 8, 0); /* thumbnail width */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
390 put_bits(p, 8, 0); /* thumbnail height */ |
672 | 391 } |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
392 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
393 /* comment */ |
1092 | 394 if(!(s->flags & CODEC_FLAG_BITEXACT)){ |
676 | 395 put_marker(p, COM); |
396 flush_put_bits(p); | |
397 ptr = pbBufPtr(p); | |
398 put_bits(p, 16, 0); /* patched later */ | |
1118 | 399 put_string(p, LIBAVCODEC_IDENT); |
400 size = strlen(LIBAVCODEC_IDENT)+3; | |
676 | 401 ptr[0] = size >> 8; |
402 ptr[1] = size; | |
403 } | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
404 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
405 |
0 | 406 void mjpeg_picture_header(MpegEncContext *s) |
407 { | |
408 put_marker(&s->pb, SOI); | |
409 | |
370
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
410 if (!s->mjpeg_data_only_frames) |
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
411 { |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
412 jpeg_put_comments(s); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
413 |
229 | 414 if (s->mjpeg_write_tables) jpeg_table_header(s); |
0 | 415 |
416 put_marker(&s->pb, SOF0); | |
417 | |
418 put_bits(&s->pb, 16, 17); | |
419 put_bits(&s->pb, 8, 8); /* 8 bits/component */ | |
420 put_bits(&s->pb, 16, s->height); | |
421 put_bits(&s->pb, 16, s->width); | |
422 put_bits(&s->pb, 8, 3); /* 3 components */ | |
423 | |
424 /* Y component */ | |
425 put_bits(&s->pb, 8, 1); /* component number */ | |
229 | 426 put_bits(&s->pb, 4, s->mjpeg_hsample[0]); /* H factor */ |
427 put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */ | |
0 | 428 put_bits(&s->pb, 8, 0); /* select matrix */ |
429 | |
430 /* Cb component */ | |
431 put_bits(&s->pb, 8, 2); /* component number */ | |
229 | 432 put_bits(&s->pb, 4, s->mjpeg_hsample[1]); /* H factor */ |
433 put_bits(&s->pb, 4, s->mjpeg_vsample[1]); /* V factor */ | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
434 #ifdef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
435 put_bits(&s->pb, 8, 1); /* select matrix */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
436 #else |
0 | 437 put_bits(&s->pb, 8, 0); /* select matrix */ |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
438 #endif |
0 | 439 |
440 /* Cr component */ | |
441 put_bits(&s->pb, 8, 3); /* component number */ | |
229 | 442 put_bits(&s->pb, 4, s->mjpeg_hsample[2]); /* H factor */ |
443 put_bits(&s->pb, 4, s->mjpeg_vsample[2]); /* V factor */ | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
444 #ifdef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
445 put_bits(&s->pb, 8, 1); /* select matrix */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
446 #else |
0 | 447 put_bits(&s->pb, 8, 0); /* select matrix */ |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
448 #endif |
370
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
449 } |
0 | 450 |
451 /* scan header */ | |
452 put_marker(&s->pb, SOS); | |
453 put_bits(&s->pb, 16, 12); /* length */ | |
454 put_bits(&s->pb, 8, 3); /* 3 components */ | |
455 | |
456 /* Y component */ | |
457 put_bits(&s->pb, 8, 1); /* index */ | |
458 put_bits(&s->pb, 4, 0); /* DC huffman table index */ | |
459 put_bits(&s->pb, 4, 0); /* AC huffman table index */ | |
460 | |
461 /* Cb component */ | |
462 put_bits(&s->pb, 8, 2); /* index */ | |
463 put_bits(&s->pb, 4, 1); /* DC huffman table index */ | |
464 put_bits(&s->pb, 4, 1); /* AC huffman table index */ | |
465 | |
466 /* Cr component */ | |
467 put_bits(&s->pb, 8, 3); /* index */ | |
468 put_bits(&s->pb, 4, 1); /* DC huffman table index */ | |
469 put_bits(&s->pb, 4, 1); /* AC huffman table index */ | |
470 | |
471 put_bits(&s->pb, 8, 0); /* Ss (not used) */ | |
472 put_bits(&s->pb, 8, 63); /* Se (not used) */ | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
473 put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */ |
0 | 474 } |
475 | |
841 | 476 static void escape_FF(MpegEncContext *s, int start) |
840 | 477 { |
841 | 478 int size= get_bit_count(&s->pb) - start*8; |
840 | 479 int i, ff_count; |
841 | 480 uint8_t *buf= s->pb.buf + start; |
1266 | 481 int align= (-(size_t)(buf))&3; |
840 | 482 |
483 assert((size&7) == 0); | |
484 size >>= 3; | |
485 | |
486 ff_count=0; | |
487 for(i=0; i<size && i<align; i++){ | |
488 if(buf[i]==0xFF) ff_count++; | |
489 } | |
490 for(; i<size-15; i+=16){ | |
491 int acc, v; | |
492 | |
493 v= *(uint32_t*)(&buf[i]); | |
494 acc= (((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
495 v= *(uint32_t*)(&buf[i+4]); | |
496 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
497 v= *(uint32_t*)(&buf[i+8]); | |
498 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
499 v= *(uint32_t*)(&buf[i+12]); | |
500 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
501 | |
502 acc>>=4; | |
503 acc+= (acc>>16); | |
504 acc+= (acc>>8); | |
505 ff_count+= acc&0xFF; | |
506 } | |
507 for(; i<size; i++){ | |
508 if(buf[i]==0xFF) ff_count++; | |
509 } | |
510 | |
511 if(ff_count==0) return; | |
512 | |
513 /* skip put bits */ | |
514 for(i=0; i<ff_count-3; i+=4) | |
515 put_bits(&s->pb, 32, 0); | |
516 put_bits(&s->pb, (ff_count-i)*8, 0); | |
517 flush_put_bits(&s->pb); | |
518 | |
519 for(i=size-1; ff_count; i--){ | |
520 int v= buf[i]; | |
521 | |
522 if(v==0xFF){ | |
523 //printf("%d %d\n", i, ff_count); | |
524 buf[i+ff_count]= 0; | |
525 ff_count--; | |
526 } | |
527 | |
528 buf[i+ff_count]= v; | |
529 } | |
530 } | |
531 | |
0 | 532 void mjpeg_picture_trailer(MpegEncContext *s) |
533 { | |
840 | 534 int pad= (-get_bit_count(&s->pb))&7; |
535 | |
536 put_bits(&s->pb, pad,0xFF>>(8-pad)); | |
537 flush_put_bits(&s->pb); | |
538 | |
841 | 539 assert((s->header_bits&7)==0); |
540 | |
541 escape_FF(s, s->header_bits>>3); | |
840 | 542 |
0 | 543 put_marker(&s->pb, EOI); |
544 } | |
545 | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
546 static inline void mjpeg_encode_dc(MpegEncContext *s, int val, |
1064 | 547 uint8_t *huff_size, uint16_t *huff_code) |
0 | 548 { |
549 int mant, nbits; | |
550 | |
551 if (val == 0) { | |
840 | 552 put_bits(&s->pb, huff_size[0], huff_code[0]); |
0 | 553 } else { |
554 mant = val; | |
555 if (val < 0) { | |
556 val = -val; | |
557 mant--; | |
558 } | |
559 | |
560 /* compute the log (XXX: optimize) */ | |
561 nbits = 0; | |
562 while (val != 0) { | |
563 val = val >> 1; | |
564 nbits++; | |
565 } | |
566 | |
840 | 567 put_bits(&s->pb, huff_size[nbits], huff_code[nbits]); |
0 | 568 |
840 | 569 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); |
0 | 570 } |
571 } | |
572 | |
573 static void encode_block(MpegEncContext *s, DCTELEM *block, int n) | |
574 { | |
575 int mant, nbits, code, i, j; | |
576 int component, dc, run, last_index, val; | |
577 MJpegContext *m = s->mjpeg_ctx; | |
1064 | 578 uint8_t *huff_size_ac; |
579 uint16_t *huff_code_ac; | |
0 | 580 |
581 /* DC coef */ | |
582 component = (n <= 3 ? 0 : n - 4 + 1); | |
583 dc = block[0]; /* overflow is impossible */ | |
584 val = dc - s->last_dc[component]; | |
585 if (n < 4) { | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
586 mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance); |
0 | 587 huff_size_ac = m->huff_size_ac_luminance; |
588 huff_code_ac = m->huff_code_ac_luminance; | |
589 } else { | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
590 mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); |
0 | 591 huff_size_ac = m->huff_size_ac_chrominance; |
592 huff_code_ac = m->huff_code_ac_chrominance; | |
593 } | |
594 s->last_dc[component] = dc; | |
595 | |
596 /* AC coefs */ | |
597 | |
598 run = 0; | |
599 last_index = s->block_last_index[n]; | |
600 for(i=1;i<=last_index;i++) { | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
601 j = s->intra_scantable.permutated[i]; |
0 | 602 val = block[j]; |
603 if (val == 0) { | |
604 run++; | |
605 } else { | |
606 while (run >= 16) { | |
840 | 607 put_bits(&s->pb, huff_size_ac[0xf0], huff_code_ac[0xf0]); |
0 | 608 run -= 16; |
609 } | |
610 mant = val; | |
611 if (val < 0) { | |
612 val = -val; | |
613 mant--; | |
614 } | |
615 | |
616 /* compute the log (XXX: optimize) */ | |
617 nbits = 0; | |
618 while (val != 0) { | |
619 val = val >> 1; | |
620 nbits++; | |
621 } | |
622 code = (run << 4) | nbits; | |
623 | |
840 | 624 put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]); |
0 | 625 |
840 | 626 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); |
0 | 627 run = 0; |
628 } | |
629 } | |
630 | |
631 /* output EOB only if not already 64 values */ | |
632 if (last_index < 63 || run != 0) | |
840 | 633 put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]); |
0 | 634 } |
635 | |
636 void mjpeg_encode_mb(MpegEncContext *s, | |
637 DCTELEM block[6][64]) | |
638 { | |
639 int i; | |
640 for(i=0;i<6;i++) { | |
641 encode_block(s, block[i], i); | |
642 } | |
643 } | |
23 | 644 |
645 /******************************************/ | |
646 /* decoding */ | |
647 | |
648 #define MAX_COMPONENTS 4 | |
649 | |
650 typedef struct MJpegDecodeContext { | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
651 AVCodecContext *avctx; |
23 | 652 GetBitContext gb; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
653 int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
654 |
23 | 655 int start_code; /* current start code */ |
656 int buffer_size; | |
1064 | 657 uint8_t *buffer; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
658 |
1064 | 659 int16_t quant_matrixes[4][64]; |
23 | 660 VLC vlcs[2][4]; |
53 | 661 |
662 int org_width, org_height; /* size given at codec init */ | |
663 int first_picture; /* true if decoding first picture */ | |
664 int interlaced; /* true if interlaced */ | |
665 int bottom_field; /* true if bottom field */ | |
666 | |
23 | 667 int width, height; |
26 | 668 int nb_components; |
669 int component_id[MAX_COMPONENTS]; | |
23 | 670 int h_count[MAX_COMPONENTS]; /* horizontal and vertical count for each component */ |
671 int v_count[MAX_COMPONENTS]; | |
672 int h_max, v_max; /* maximum h and v counts */ | |
673 int quant_index[4]; /* quant table index for each component */ | |
674 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */ | |
1064 | 675 uint8_t *current_picture[MAX_COMPONENTS]; /* picture structure */ |
23 | 676 int linesize[MAX_COMPONENTS]; |
677 DCTELEM block[64] __align8; | |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
678 ScanTable scantable; |
1064 | 679 void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/); |
354 | 680 |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
681 int restart_interval; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
682 int restart_count; |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
683 |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
684 int buggy_avid; |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
685 int interlace_polarity; |
23 | 686 } MJpegDecodeContext; |
687 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
688 static int mjpeg_decode_dht(MJpegDecodeContext *s); |
375 | 689 |
1064 | 690 static void build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table, |
29 | 691 int nb_codes) |
692 { | |
1064 | 693 uint8_t huff_size[256]; |
694 uint16_t huff_code[256]; | |
29 | 695 |
696 memset(huff_size, 0, sizeof(huff_size)); | |
697 build_huffman_codes(huff_size, huff_code, bits_table, val_table); | |
698 | |
699 init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2); | |
700 } | |
701 | |
23 | 702 static int mjpeg_decode_init(AVCodecContext *avctx) |
703 { | |
704 MJpegDecodeContext *s = avctx->priv_data; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
705 MpegEncContext s2; |
23 | 706 |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
707 s->avctx = avctx; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
708 |
1092 | 709 /* ugly way to get the idct & scantable FIXME */ |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
710 memset(&s2, 0, sizeof(MpegEncContext)); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
711 s2.flags= avctx->flags; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
712 s2.avctx= avctx; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
713 // s2->out_format = FMT_MJPEG; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
714 s2.width = 8; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
715 s2.height = 8; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
716 if (MPV_common_init(&s2) < 0) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
717 return -1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
718 s->scantable= s2.intra_scantable; |
1092 | 719 s->idct_put= s2.dsp.idct_put; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
720 MPV_common_end(&s2); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
721 |
23 | 722 s->mpeg_enc_ctx_allocated = 0; |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
723 s->buffer_size = 102400; /* smaller buffer should be enough, |
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
724 but photojpg files could ahive bigger sizes */ |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
725 s->buffer = av_malloc(s->buffer_size); |
935 | 726 if (!s->buffer) |
727 return -1; | |
23 | 728 s->start_code = -1; |
53 | 729 s->first_picture = 1; |
730 s->org_width = avctx->width; | |
731 s->org_height = avctx->height; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
732 |
29 | 733 build_vlc(&s->vlcs[0][0], bits_dc_luminance, val_dc_luminance, 12); |
734 build_vlc(&s->vlcs[0][1], bits_dc_chrominance, val_dc_chrominance, 12); | |
735 build_vlc(&s->vlcs[1][0], bits_ac_luminance, val_ac_luminance, 251); | |
736 build_vlc(&s->vlcs[1][1], bits_ac_chrominance, val_ac_chrominance, 251); | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
737 |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
738 if (avctx->flags & CODEC_FLAG_EXTERN_HUFF) |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
739 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
740 printf("mjpeg: using external huffman table\n"); |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
741 init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8); |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
742 mjpeg_decode_dht(s); |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
743 /* should check for error - but dunno */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
744 } |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
745 |
23 | 746 return 0; |
747 } | |
748 | |
749 /* quantize tables */ | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
750 static int mjpeg_decode_dqt(MJpegDecodeContext *s) |
23 | 751 { |
37 | 752 int len, index, i, j; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
753 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
754 len = get_bits(&s->gb, 16) - 2; |
23 | 755 |
756 while (len >= 65) { | |
757 /* only 8 bit precision handled */ | |
758 if (get_bits(&s->gb, 4) != 0) | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
759 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
760 dprintf("dqt: 16bit precision\n"); |
23 | 761 return -1; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
762 } |
23 | 763 index = get_bits(&s->gb, 4); |
764 if (index >= 4) | |
765 return -1; | |
766 dprintf("index=%d\n", index); | |
767 /* read quant table */ | |
37 | 768 for(i=0;i<64;i++) { |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
769 j = s->scantable.permutated[i]; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
770 s->quant_matrixes[index][j] = get_bits(&s->gb, 8); |
37 | 771 } |
23 | 772 len -= 65; |
773 } | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
774 |
23 | 775 return 0; |
776 } | |
777 | |
778 /* decode huffman tables and build VLC decoders */ | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
779 static int mjpeg_decode_dht(MJpegDecodeContext *s) |
23 | 780 { |
781 int len, index, i, class, n, v, code_max; | |
1064 | 782 uint8_t bits_table[17]; |
783 uint8_t val_table[256]; | |
23 | 784 |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
785 len = get_bits(&s->gb, 16) - 2; |
23 | 786 |
787 while (len > 0) { | |
788 if (len < 17) | |
789 return -1; | |
790 class = get_bits(&s->gb, 4); | |
791 if (class >= 2) | |
792 return -1; | |
793 index = get_bits(&s->gb, 4); | |
794 if (index >= 4) | |
795 return -1; | |
796 n = 0; | |
797 for(i=1;i<=16;i++) { | |
798 bits_table[i] = get_bits(&s->gb, 8); | |
799 n += bits_table[i]; | |
800 } | |
801 len -= 17; | |
802 if (len < n || n > 256) | |
803 return -1; | |
804 | |
805 code_max = 0; | |
806 for(i=0;i<n;i++) { | |
807 v = get_bits(&s->gb, 8); | |
808 if (v > code_max) | |
809 code_max = v; | |
810 val_table[i] = v; | |
811 } | |
812 len -= n; | |
813 | |
814 /* build VLC and flush previous vlc if present */ | |
815 free_vlc(&s->vlcs[class][index]); | |
816 dprintf("class=%d index=%d nb_codes=%d\n", | |
817 class, index, code_max + 1); | |
29 | 818 build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1); |
23 | 819 } |
820 return 0; | |
821 } | |
822 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
823 static int mjpeg_decode_sof0(MJpegDecodeContext *s) |
23 | 824 { |
26 | 825 int len, nb_components, i, width, height; |
23 | 826 |
827 /* XXX: verify len field validity */ | |
828 len = get_bits(&s->gb, 16); | |
829 /* only 8 bits/component accepted */ | |
830 if (get_bits(&s->gb, 8) != 8) | |
831 return -1; | |
832 height = get_bits(&s->gb, 16); | |
833 width = get_bits(&s->gb, 16); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
834 dprintf("sof0: picture: %dx%d\n", width, height); |
23 | 835 |
836 nb_components = get_bits(&s->gb, 8); | |
837 if (nb_components <= 0 || | |
838 nb_components > MAX_COMPONENTS) | |
839 return -1; | |
26 | 840 s->nb_components = nb_components; |
23 | 841 s->h_max = 1; |
842 s->v_max = 1; | |
843 for(i=0;i<nb_components;i++) { | |
844 /* component id */ | |
26 | 845 s->component_id[i] = get_bits(&s->gb, 8) - 1; |
23 | 846 s->h_count[i] = get_bits(&s->gb, 4); |
847 s->v_count[i] = get_bits(&s->gb, 4); | |
848 /* compute hmax and vmax (only used in interleaved case) */ | |
849 if (s->h_count[i] > s->h_max) | |
850 s->h_max = s->h_count[i]; | |
851 if (s->v_count[i] > s->v_max) | |
852 s->v_max = s->v_count[i]; | |
853 s->quant_index[i] = get_bits(&s->gb, 8); | |
854 if (s->quant_index[i] >= 4) | |
855 return -1; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
856 dprintf("component %d %d:%d id: %d quant:%d\n", i, s->h_count[i], |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
857 s->v_count[i], s->component_id[i], s->quant_index[i]); |
23 | 858 } |
859 | |
860 /* if different size, realloc/alloc picture */ | |
861 /* XXX: also check h_count and v_count */ | |
862 if (width != s->width || height != s->height) { | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
863 for(i=0;i<MAX_COMPONENTS;i++) |
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
864 av_freep(&s->current_picture[i]); |
23 | 865 s->width = width; |
866 s->height = height; | |
53 | 867 /* test interlaced mode */ |
868 if (s->first_picture && | |
869 s->org_height != 0 && | |
870 s->height < ((s->org_height * 3) / 4)) { | |
871 s->interlaced = 1; | |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
872 // s->bottom_field = (s->interlace_polarity) ? 1 : 0; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
873 s->bottom_field = 0; |
53 | 874 } |
875 | |
23 | 876 for(i=0;i<nb_components;i++) { |
226 | 877 int w, h; |
878 w = (s->width + 8 * s->h_max - 1) / (8 * s->h_max); | |
879 h = (s->height + 8 * s->v_max - 1) / (8 * s->v_max); | |
880 w = w * 8 * s->h_count[i]; | |
881 h = h * 8 * s->v_count[i]; | |
53 | 882 if (s->interlaced) |
883 w *= 2; | |
23 | 884 s->linesize[i] = w; |
885 s->current_picture[i] = av_mallocz(w * h); | |
901 | 886 if (!s->current_picture[i]) |
887 { | |
888 dprintf("error: no picture buffers allocated\n"); | |
889 return -1; | |
890 } | |
23 | 891 } |
53 | 892 s->first_picture = 0; |
23 | 893 } |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
894 |
354 | 895 if (len != (8+(3*nb_components))) |
896 { | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
897 dprintf("decode_sof0: error, len(%d) mismatch\n", len); |
354 | 898 } |
53 | 899 |
23 | 900 return 0; |
901 } | |
902 | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
903 static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index) |
23 | 904 { |
905 int code, diff; | |
780 | 906 code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2); |
23 | 907 if (code < 0) |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
908 { |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
909 dprintf("mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index, |
427 | 910 &s->vlcs[0][dc_index]); |
23 | 911 return 0xffff; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
912 } |
23 | 913 if (code == 0) { |
914 diff = 0; | |
915 } else { | |
1275 | 916 diff = get_xbits(&s->gb, code); |
23 | 917 } |
918 return diff; | |
919 } | |
920 | |
921 /* decode block and dequantize */ | |
922 static int decode_block(MJpegDecodeContext *s, DCTELEM *block, | |
923 int component, int dc_index, int ac_index, int quant_index) | |
924 { | |
925 int nbits, code, i, j, level; | |
926 int run, val; | |
927 VLC *ac_vlc; | |
1064 | 928 int16_t *quant_matrix; |
23 | 929 |
930 /* DC coef */ | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
931 val = mjpeg_decode_dc(s, dc_index); |
23 | 932 if (val == 0xffff) { |
933 dprintf("error dc\n"); | |
934 return -1; | |
935 } | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
936 quant_matrix = s->quant_matrixes[quant_index]; |
23 | 937 val = val * quant_matrix[0] + s->last_dc[component]; |
938 s->last_dc[component] = val; | |
939 block[0] = val; | |
940 /* AC coefs */ | |
941 ac_vlc = &s->vlcs[1][ac_index]; | |
942 i = 1; | |
943 for(;;) { | |
780 | 944 code = get_vlc2(&s->gb, s->vlcs[1][ac_index].table, 9, 2); |
1275 | 945 |
23 | 946 if (code < 0) { |
947 dprintf("error ac\n"); | |
948 return -1; | |
949 } | |
950 /* EOB */ | |
951 if (code == 0) | |
952 break; | |
953 if (code == 0xf0) { | |
954 i += 16; | |
955 } else { | |
956 run = code >> 4; | |
957 nbits = code & 0xf; | |
1275 | 958 level = get_xbits(&s->gb, nbits); |
23 | 959 i += run; |
960 if (i >= 64) { | |
961 dprintf("error count: %d\n", i); | |
962 return -1; | |
963 } | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
964 j = s->scantable.permutated[i]; |
23 | 965 block[j] = level * quant_matrix[j]; |
966 i++; | |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
967 if (i >= 64) |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
968 break; |
23 | 969 } |
970 } | |
971 return 0; | |
972 } | |
973 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
974 static int mjpeg_decode_sos(MJpegDecodeContext *s) |
23 | 975 { |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
976 int len, nb_components, i, j, n, h, v, ret; |
26 | 977 int mb_width, mb_height, mb_x, mb_y, vmax, hmax, index, id; |
23 | 978 int comp_index[4]; |
979 int dc_index[4]; | |
980 int ac_index[4]; | |
981 int nb_blocks[4]; | |
982 int h_count[4]; | |
983 int v_count[4]; | |
984 | |
985 /* XXX: verify len field validity */ | |
986 len = get_bits(&s->gb, 16); | |
987 nb_components = get_bits(&s->gb, 8); | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
988 if (len != 6+2*nb_components) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
989 { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
990 dprintf("decode_sos: invalid len (%d)\n", len); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
991 return -1; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
992 } |
23 | 993 /* XXX: only interleaved scan accepted */ |
994 if (nb_components != 3) | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
995 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
996 dprintf("decode_sos: components(%d) mismatch\n", nb_components); |
23 | 997 return -1; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
998 } |
23 | 999 vmax = 0; |
1000 hmax = 0; | |
1001 for(i=0;i<nb_components;i++) { | |
26 | 1002 id = get_bits(&s->gb, 8) - 1; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1003 dprintf("component: %d\n", id); |
26 | 1004 /* find component index */ |
1005 for(index=0;index<s->nb_components;index++) | |
1006 if (id == s->component_id[index]) | |
1007 break; | |
1008 if (index == s->nb_components) | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1009 { |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1010 dprintf("decode_sos: index(%d) out of components\n", index); |
23 | 1011 return -1; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1012 } |
26 | 1013 |
23 | 1014 comp_index[i] = index; |
1015 nb_blocks[i] = s->h_count[index] * s->v_count[index]; | |
1016 h_count[i] = s->h_count[index]; | |
1017 v_count[i] = s->v_count[index]; | |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1018 |
23 | 1019 dc_index[i] = get_bits(&s->gb, 4); |
1020 ac_index[i] = get_bits(&s->gb, 4); | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1021 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1022 if (dc_index[i] < 0 || ac_index[i] < 0 || |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1023 dc_index[i] >= 4 || ac_index[i] >= 4) |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1024 goto out_of_range; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1025 switch(s->start_code) |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1026 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1027 case SOF0: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1028 if (dc_index[i] > 1 || ac_index[i] > 1) |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1029 goto out_of_range; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1030 break; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1031 case SOF1: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1032 case SOF2: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1033 if (dc_index[i] > 3 || ac_index[i] > 3) |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1034 goto out_of_range; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1035 break; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1036 case SOF3: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1037 if (dc_index[i] > 3 || ac_index[i] != 0) |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1038 goto out_of_range; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1039 break; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1040 } |
23 | 1041 } |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1042 skip_bits(&s->gb, 8); /* Ss */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1043 skip_bits(&s->gb, 8); /* Se */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1044 skip_bits(&s->gb, 8); /* Ah and Al (each are 4 bits) */ |
23 | 1045 |
1046 for(i=0;i<nb_components;i++) | |
1047 s->last_dc[i] = 1024; | |
1048 | |
1049 if (nb_components > 1) { | |
1050 /* interleaved stream */ | |
1051 mb_width = (s->width + s->h_max * 8 - 1) / (s->h_max * 8); | |
1052 mb_height = (s->height + s->v_max * 8 - 1) / (s->v_max * 8); | |
1053 } else { | |
1054 h = s->h_max / s->h_count[comp_index[0]]; | |
1055 v = s->v_max / s->v_count[comp_index[0]]; | |
1056 mb_width = (s->width + h * 8 - 1) / (h * 8); | |
1057 mb_height = (s->height + v * 8 - 1) / (v * 8); | |
1058 nb_blocks[0] = 1; | |
1059 h_count[0] = 1; | |
1060 v_count[0] = 1; | |
1061 } | |
881 | 1062 |
23 | 1063 for(mb_y = 0; mb_y < mb_height; mb_y++) { |
1064 for(mb_x = 0; mb_x < mb_width; mb_x++) { | |
1065 for(i=0;i<nb_components;i++) { | |
1064 | 1066 uint8_t *ptr; |
23 | 1067 int x, y, c; |
1068 n = nb_blocks[i]; | |
1069 c = comp_index[i]; | |
1070 h = h_count[i]; | |
1071 v = v_count[i]; | |
1072 x = 0; | |
1073 y = 0; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1074 if (s->restart_interval && !s->restart_count) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1075 s->restart_count = s->restart_interval; |
23 | 1076 for(j=0;j<n;j++) { |
1077 memset(s->block, 0, sizeof(s->block)); | |
1078 if (decode_block(s, s->block, i, | |
1079 dc_index[i], ac_index[i], | |
1080 s->quant_index[c]) < 0) { | |
427 | 1081 dprintf("error y=%d x=%d\n", mb_y, mb_x); |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1082 ret = -1; |
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1083 goto the_end; |
23 | 1084 } |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1085 // dprintf("mb: %d %d processed\n", mb_y, mb_x); |
23 | 1086 ptr = s->current_picture[c] + |
1087 (s->linesize[c] * (v * mb_y + y) * 8) + | |
1088 (h * mb_x + x) * 8; | |
53 | 1089 if (s->interlaced && s->bottom_field) |
1090 ptr += s->linesize[c] >> 1; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
1091 s->idct_put(ptr, s->linesize[c], s->block); |
23 | 1092 if (++x == h) { |
1093 x = 0; | |
1094 y++; | |
1095 } | |
1096 } | |
1097 } | |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1098 /* (< 1350) buggy workaround for Spectralfan.mov, should be fixed */ |
881 | 1099 if (s->restart_interval && (s->restart_interval < 1350) && |
1100 !--s->restart_count) { | |
584
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1101 align_get_bits(&s->gb); |
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1102 skip_bits(&s->gb, 16); /* skip RSTn */ |
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1103 for (j=0; j<nb_components; j++) /* reset dc */ |
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1104 s->last_dc[j] = 1024; |
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1105 } |
23 | 1106 } |
1107 } | |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1108 ret = 0; |
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1109 the_end: |
44
92d51f683931
added forgotten emms() - fix various segmentation faults when using mjpeg
glantau
parents:
37
diff
changeset
|
1110 emms_c(); |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1111 return ret; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1112 out_of_range: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1113 dprintf("decode_sos: ac/dc index out of range\n"); |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1114 return -1; |
23 | 1115 } |
1116 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1117 static int mjpeg_decode_dri(MJpegDecodeContext *s) |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1118 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1119 if (get_bits(&s->gb, 16) != 4) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1120 return -1; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1121 s->restart_interval = get_bits(&s->gb, 16); |
507
b5b91e89b88c
* turned into debug message - it's annoying when watching mjpeg files
kabi
parents:
477
diff
changeset
|
1122 dprintf("restart interval: %d\n", s->restart_interval); |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1123 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1124 return 0; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1125 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1126 |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1127 static int mjpeg_decode_app(MJpegDecodeContext *s) |
354 | 1128 { |
1129 int len, id; | |
1130 | |
1131 /* XXX: verify len field validity */ | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1132 len = get_bits(&s->gb, 16); |
354 | 1133 if (len < 5) |
1134 return -1; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1135 |
811 | 1136 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
1137 id = be2me_32(id); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1138 len -= 6; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1139 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1140 /* buggy AVID, it puts EOI only at every 10th frame */ |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1141 /* also this fourcc is used by non-avid files too, it holds some |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1142 informations, but it's always present in AVID creates files */ |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1143 if (id == ff_get_fourcc("AVI1")) |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1144 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1145 /* structure: |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1146 4bytes AVI1 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1147 1bytes polarity |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1148 1bytes always zero |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1149 4bytes field_size |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1150 4bytes field_size_less_padding |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1151 */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1152 s->buggy_avid = 1; |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1153 // if (s->first_picture) |
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1154 // printf("mjpeg: workarounding buggy AVID\n"); |
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1155 s->interlace_polarity = get_bits(&s->gb, 8); |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1156 #if 0 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1157 skip_bits(&s->gb, 8); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1158 skip_bits(&s->gb, 32); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1159 skip_bits(&s->gb, 32); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1160 len -= 10; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1161 #endif |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1162 // if (s->interlace_polarity) |
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1163 // printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity); |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1164 goto out; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1165 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1166 |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1167 // len -= 2; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1168 |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1169 if (id == ff_get_fourcc("JFIF")) |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1170 { |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1171 int t_w, t_h; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1172 skip_bits(&s->gb, 8); /* the trailing zero-byte */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1173 printf("mjpeg: JFIF header found (version: %x.%x)\n", |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1174 get_bits(&s->gb, 8), get_bits(&s->gb, 8)); |
672 | 1175 if (get_bits(&s->gb, 8) == 0) |
1176 { | |
949 | 1177 int x_density, y_density; |
1178 x_density = get_bits(&s->gb, 16); | |
1179 y_density = get_bits(&s->gb, 16); | |
903 | 1180 |
935 | 1181 dprintf("x/y density: %d (%f), %d (%f)\n", x_density, |
1182 (float)x_density, y_density, (float)y_density); | |
1183 #if 0 | |
903 | 1184 //MN: needs to be checked |
916
259f3efebef5
fixing aspect (hopefully, i couldnt reproduce the bug)
michaelni
parents:
903
diff
changeset
|
1185 if(x_density) |
935 | 1186 // s->avctx->aspect_ratio= s->width*y_density/((float)s->height*x_density); |
1187 s->avctx->aspect_ratio = (float)x_density/y_density; | |
1188 /* it's better, but every JFIF I have seen stores 1:1 */ | |
916
259f3efebef5
fixing aspect (hopefully, i couldnt reproduce the bug)
michaelni
parents:
903
diff
changeset
|
1189 else |
259f3efebef5
fixing aspect (hopefully, i couldnt reproduce the bug)
michaelni
parents:
903
diff
changeset
|
1190 s->avctx->aspect_ratio= 0.0; |
935 | 1191 #endif |
672 | 1192 } |
1193 else | |
1194 { | |
1195 skip_bits(&s->gb, 16); | |
1196 skip_bits(&s->gb, 16); | |
1197 } | |
935 | 1198 |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1199 t_w = get_bits(&s->gb, 8); |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1200 t_h = get_bits(&s->gb, 8); |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1201 if (t_w && t_h) |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1202 { |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1203 /* skip thumbnail */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1204 if (len-10-(t_w*t_h*3) > 0) |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1205 len -= t_w*t_h*3; |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1206 } |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1207 len -= 10; |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1208 goto out; |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1209 } |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1210 |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1211 if (id == ff_get_fourcc("Adob") && (get_bits(&s->gb, 8) == 'e')) |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1212 { |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1213 printf("mjpeg: Adobe header found\n"); |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1214 skip_bits(&s->gb, 16); /* version */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1215 skip_bits(&s->gb, 16); /* flags0 */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1216 skip_bits(&s->gb, 16); /* flags1 */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1217 skip_bits(&s->gb, 8); /* transform */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1218 len -= 7; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1219 goto out; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1220 } |
354 | 1221 |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1222 /* Apple MJPEG-A */ |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1223 if ((s->start_code == APP1) && (len > (0x28 - 8))) |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1224 { |
811 | 1225 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
1226 id = be2me_32(id); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1227 len -= 4; |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1228 if (id == ff_get_fourcc("mjpg")) /* Apple MJPEG-A */ |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1229 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1230 #if 0 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1231 skip_bits(&s->gb, 32); /* field size */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1232 skip_bits(&s->gb, 32); /* pad field size */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1233 skip_bits(&s->gb, 32); /* next off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1234 skip_bits(&s->gb, 32); /* quant off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1235 skip_bits(&s->gb, 32); /* huff off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1236 skip_bits(&s->gb, 32); /* image off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1237 skip_bits(&s->gb, 32); /* scan off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1238 skip_bits(&s->gb, 32); /* data off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1239 #endif |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1240 if (s->first_picture) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1241 printf("mjpeg: Apple MJPEG-A header found\n"); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1242 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1243 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1244 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1245 out: |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1246 /* slow but needed for extreme adobe jpegs */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1247 if (len < 0) |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1248 printf("mjpeg: error, decode_app parser read over the end\n"); |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1249 while(--len > 0) |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1250 skip_bits(&s->gb, 8); |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1251 |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1252 return 0; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1253 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1254 |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1255 static int mjpeg_decode_com(MJpegDecodeContext *s) |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1256 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1257 /* XXX: verify len field validity */ |
1061 | 1258 unsigned int len = get_bits(&s->gb, 16); |
1259 if (len >= 2 && len < 32768) { | |
1260 /* XXX: any better upper bound */ | |
1064 | 1261 uint8_t *cbuf = av_malloc(len - 1); |
1061 | 1262 if (cbuf) { |
1263 int i; | |
1264 for (i = 0; i < len - 2; i++) | |
1265 cbuf[i] = get_bits(&s->gb, 8); | |
1266 if (i > 0 && cbuf[i-1] == '\n') | |
1267 cbuf[i-1] = 0; | |
1268 else | |
1269 cbuf[i] = 0; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1270 |
1061 | 1271 printf("mjpeg comment: '%s'\n", cbuf); |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1272 |
1061 | 1273 /* buggy avid, it puts EOI only at every 10th frame */ |
1274 if (!strcmp(cbuf, "AVID")) | |
1275 { | |
1276 s->buggy_avid = 1; | |
1277 // if (s->first_picture) | |
1278 // printf("mjpeg: workarounding buggy AVID\n"); | |
1279 } | |
1280 | |
1281 av_free(cbuf); | |
1282 } | |
354 | 1283 } |
1284 | |
1285 return 0; | |
1286 } | |
1287 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1288 #if 0 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1289 static int valid_marker_list[] = |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1290 { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1291 /* 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1292 /* 0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1293 /* 1 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1294 /* 2 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1295 /* 3 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1296 /* 4 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1297 /* 5 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1298 /* 6 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1299 /* 7 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1300 /* 8 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1301 /* 9 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1302 /* a */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1303 /* b */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1304 /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1305 /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1306 /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1307 /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1308 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1309 #endif |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1310 |
23 | 1311 /* return the 8 bit start code value and update the search |
1312 state. Return -1 if no start code found */ | |
1064 | 1313 static int find_marker(uint8_t **pbuf_ptr, uint8_t *buf_end) |
23 | 1314 { |
1064 | 1315 uint8_t *buf_ptr; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1316 unsigned int v, v2; |
23 | 1317 int val; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1318 #ifdef DEBUG |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1319 int skipped=0; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1320 #endif |
23 | 1321 |
1322 buf_ptr = *pbuf_ptr; | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1323 while (buf_ptr < buf_end) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1324 v = *buf_ptr++; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1325 v2 = *buf_ptr; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1326 if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe)) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1327 val = *buf_ptr++; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1328 goto found; |
23 | 1329 } |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1330 #ifdef DEBUG |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1331 skipped++; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1332 #endif |
23 | 1333 } |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1334 val = -1; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1335 found: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1336 #ifdef DEBUG |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1337 dprintf("find_marker skipped %d bytes\n", skipped); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1338 #endif |
23 | 1339 *pbuf_ptr = buf_ptr; |
1340 return val; | |
1341 } | |
1342 | |
1343 static int mjpeg_decode_frame(AVCodecContext *avctx, | |
1344 void *data, int *data_size, | |
1064 | 1345 uint8_t *buf, int buf_size) |
23 | 1346 { |
1347 MJpegDecodeContext *s = avctx->priv_data; | |
1064 | 1348 uint8_t *buf_end, *buf_ptr; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1349 int i, start_code; |
23 | 1350 AVPicture *picture = data; |
1351 | |
68 | 1352 *data_size = 0; |
1353 | |
23 | 1354 /* no supplementary picture */ |
68 | 1355 if (buf_size == 0) |
23 | 1356 return 0; |
1357 | |
1358 buf_ptr = buf; | |
1359 buf_end = buf + buf_size; | |
1360 while (buf_ptr < buf_end) { | |
1361 /* find start next marker */ | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1362 start_code = find_marker(&buf_ptr, buf_end); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1363 { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1364 /* EOF */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1365 if (start_code < 0) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1366 goto the_end; |
354 | 1367 } else { |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1368 dprintf("marker=%x avail_size_in_buf=%d\n", start_code, buf_end - buf_ptr); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1369 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1370 if ((buf_end - buf_ptr) > s->buffer_size) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1371 { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1372 av_free(s->buffer); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1373 s->buffer_size = buf_end-buf_ptr; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1374 s->buffer = av_malloc(s->buffer_size); |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1375 dprintf("buffer too small, expanding to %d bytes\n", |
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1376 s->buffer_size); |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1377 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1378 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1379 /* unescape buffer of SOS */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1380 if (start_code == SOS) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1381 { |
1064 | 1382 uint8_t *src = buf_ptr; |
1383 uint8_t *dst = s->buffer; | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1384 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1385 while (src<buf_end) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1386 { |
1064 | 1387 uint8_t x = *(src++); |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1388 |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1389 *(dst++) = x; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1390 if (x == 0xff) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1391 { |
840 | 1392 while(*src == 0xff) src++; |
1393 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1394 x = *(src++); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1395 if (x >= 0xd0 && x <= 0xd7) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1396 *(dst++) = x; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1397 else if (x) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1398 break; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1399 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1400 } |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
1401 init_get_bits(&s->gb, s->buffer, (dst - s->buffer)*8); |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1402 |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1403 dprintf("escaping removed %d bytes\n", |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1404 (buf_end - buf_ptr) - (dst - s->buffer)); |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1405 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1406 else |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
1407 init_get_bits(&s->gb, buf_ptr, (buf_end - buf_ptr)*8); |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1408 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1409 s->start_code = start_code; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1410 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1411 /* process markers */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1412 if (start_code >= 0xd0 && start_code <= 0xd7) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1413 dprintf("restart marker: %d\n", start_code&0x0f); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1414 } else if (s->first_picture) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1415 /* APP fields */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1416 if (start_code >= 0xe0 && start_code <= 0xef) |
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1417 mjpeg_decode_app(s); |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1418 /* Comment */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1419 else if (start_code == COM) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1420 mjpeg_decode_com(s); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1421 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1422 |
23 | 1423 switch(start_code) { |
1424 case SOI: | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1425 s->restart_interval = 0; |
23 | 1426 /* nothing to do on SOI */ |
1427 break; | |
1428 case DQT: | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1429 mjpeg_decode_dqt(s); |
23 | 1430 break; |
1431 case DHT: | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1432 mjpeg_decode_dht(s); |
23 | 1433 break; |
1434 case SOF0: | |
901 | 1435 if (mjpeg_decode_sof0(s) < 0) |
1436 return -1; | |
23 | 1437 break; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1438 case EOI: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1439 eoi_parser: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1440 { |
53 | 1441 if (s->interlaced) { |
1442 s->bottom_field ^= 1; | |
1443 /* if not bottom field, do not output image yet */ | |
1444 if (s->bottom_field) | |
540
4cee7ce37e10
don't exit decoder after decoding first field -> fixes angels.avi interlacing
arpi_esp
parents:
527
diff
changeset
|
1445 goto not_the_end; |
53 | 1446 } |
23 | 1447 for(i=0;i<3;i++) { |
1448 picture->data[i] = s->current_picture[i]; | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1449 picture->linesize[i] = (s->interlaced) ? |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1450 s->linesize[i] >> 1 : s->linesize[i]; |
23 | 1451 } |
1452 *data_size = sizeof(AVPicture); | |
1453 avctx->height = s->height; | |
53 | 1454 if (s->interlaced) |
1455 avctx->height *= 2; | |
23 | 1456 avctx->width = s->width; |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1457 /* XXX: not complete test ! */ |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1458 switch((s->h_count[0] << 4) | s->v_count[0]) { |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1459 case 0x11: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1460 avctx->pix_fmt = PIX_FMT_YUV444P; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1461 break; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1462 case 0x21: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1463 avctx->pix_fmt = PIX_FMT_YUV422P; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1464 break; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1465 default: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1466 case 0x22: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1467 avctx->pix_fmt = PIX_FMT_YUV420P; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1468 break; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1469 } |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1470 /* dummy quality */ |
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1471 /* XXX: infer it with matrix */ |
903 | 1472 // avctx->quality = 3; |
23 | 1473 goto the_end; |
1474 } | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1475 break; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1476 case SOS: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1477 mjpeg_decode_sos(s); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1478 /* buggy avid puts EOI every 10-20th frame */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1479 /* if restart period is over process EOI */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1480 if ((s->buggy_avid && !s->interlaced) || s->restart_interval) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1481 goto eoi_parser; |
23 | 1482 break; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1483 case DRI: |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1484 mjpeg_decode_dri(s); |
354 | 1485 break; |
1486 case SOF1: | |
1487 case SOF2: | |
1488 case SOF3: | |
1489 case SOF5: | |
1490 case SOF6: | |
1491 case SOF7: | |
1492 case SOF9: | |
1493 case SOF10: | |
1494 case SOF11: | |
1495 case SOF13: | |
1496 case SOF14: | |
1497 case SOF15: | |
1498 case JPG: | |
1499 printf("mjpeg: unsupported coding type (%x)\n", start_code); | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1500 break; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1501 // default: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1502 // printf("mjpeg: unsupported marker (%x)\n", start_code); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1503 // break; |
23 | 1504 } |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1505 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1506 not_the_end: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1507 /* eof process start code */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1508 buf_ptr += (get_bits_count(&s->gb)+7)/8; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1509 dprintf("marker parser used %d bytes (%d bits)\n", |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1510 (get_bits_count(&s->gb)+7)/8, get_bits_count(&s->gb)); |
23 | 1511 } |
1512 } | |
1513 } | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1514 the_end: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1515 dprintf("mjpeg decode frame unused %d bytes\n", buf_end - buf_ptr); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1516 // return buf_end - buf_ptr; |
23 | 1517 return buf_ptr - buf; |
1518 } | |
1519 | |
881 | 1520 static int mjpegb_decode_frame(AVCodecContext *avctx, |
1521 void *data, int *data_size, | |
1064 | 1522 uint8_t *buf, int buf_size) |
881 | 1523 { |
1524 MJpegDecodeContext *s = avctx->priv_data; | |
1064 | 1525 uint8_t *buf_end, *buf_ptr; |
881 | 1526 int i; |
1527 AVPicture *picture = data; | |
1528 GetBitContext hgb; /* for the header */ | |
1529 uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs; | |
1530 uint32_t field_size; | |
1531 | |
1532 *data_size = 0; | |
1533 | |
1534 /* no supplementary picture */ | |
1535 if (buf_size == 0) | |
1536 return 0; | |
1537 | |
1538 buf_ptr = buf; | |
1539 buf_end = buf + buf_size; | |
1540 | |
1541 read_header: | |
1542 /* reset on every SOI */ | |
1543 s->restart_interval = 0; | |
1544 | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
1545 init_get_bits(&hgb, buf_ptr, /*buf_size*/(buf_end - buf_ptr)*8); |
881 | 1546 |
1547 skip_bits(&hgb, 32); /* reserved zeros */ | |
1548 | |
1549 if (get_bits(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg"))) | |
1550 { | |
1551 dprintf("not mjpeg-b (bad fourcc)\n"); | |
1552 return 0; | |
1553 } | |
1554 | |
1555 field_size = get_bits(&hgb, 32); /* field size */ | |
1556 dprintf("field size: 0x%x\n", field_size); | |
1557 skip_bits(&hgb, 32); /* padded field size */ | |
1558 second_field_offs = get_bits(&hgb, 32); | |
1559 dprintf("second field offs: 0x%x\n", second_field_offs); | |
1560 if (second_field_offs) | |
1561 s->interlaced = 1; | |
1562 | |
1563 dqt_offs = get_bits(&hgb, 32); | |
1564 dprintf("dqt offs: 0x%x\n", dqt_offs); | |
1565 if (dqt_offs) | |
1566 { | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
1567 init_get_bits(&s->gb, buf+dqt_offs, (buf_end - (buf+dqt_offs))*8); |
881 | 1568 s->start_code = DQT; |
1569 mjpeg_decode_dqt(s); | |
1570 } | |
1571 | |
1572 dht_offs = get_bits(&hgb, 32); | |
1573 dprintf("dht offs: 0x%x\n", dht_offs); | |
1574 if (dht_offs) | |
1575 { | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
1576 init_get_bits(&s->gb, buf+dht_offs, (buf_end - (buf+dht_offs))*8); |
881 | 1577 s->start_code = DHT; |
1578 mjpeg_decode_dht(s); | |
1579 } | |
1580 | |
1581 sof_offs = get_bits(&hgb, 32); | |
1582 dprintf("sof offs: 0x%x\n", sof_offs); | |
1583 if (sof_offs) | |
1584 { | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
1585 init_get_bits(&s->gb, buf+sof_offs, (buf_end - (buf+sof_offs))*8); |
881 | 1586 s->start_code = SOF0; |
901 | 1587 if (mjpeg_decode_sof0(s) < 0) |
1588 return -1; | |
881 | 1589 } |
1590 | |
1591 sos_offs = get_bits(&hgb, 32); | |
1592 dprintf("sos offs: 0x%x\n", sos_offs); | |
1593 if (sos_offs) | |
1594 { | |
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
1595 // init_get_bits(&s->gb, buf+sos_offs, (buf_end - (buf+sos_offs))*8); |
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
1596 init_get_bits(&s->gb, buf+sos_offs, field_size*8); |
881 | 1597 s->start_code = SOS; |
1598 mjpeg_decode_sos(s); | |
1599 } | |
1600 | |
1601 skip_bits(&hgb, 32); /* start of data offset */ | |
1602 | |
1603 if (s->interlaced) { | |
1604 s->bottom_field ^= 1; | |
1605 /* if not bottom field, do not output image yet */ | |
1606 if (s->bottom_field && second_field_offs) | |
1607 { | |
1608 buf_ptr = buf + second_field_offs; | |
1609 second_field_offs = 0; | |
1610 goto read_header; | |
1611 } | |
1612 } | |
1613 | |
1614 for(i=0;i<3;i++) { | |
1615 picture->data[i] = s->current_picture[i]; | |
1616 picture->linesize[i] = (s->interlaced) ? | |
1617 s->linesize[i] >> 1 : s->linesize[i]; | |
1618 } | |
1619 *data_size = sizeof(AVPicture); | |
1620 avctx->height = s->height; | |
1621 if (s->interlaced) | |
1622 avctx->height *= 2; | |
1623 avctx->width = s->width; | |
1624 /* XXX: not complete test ! */ | |
1625 switch((s->h_count[0] << 4) | s->v_count[0]) { | |
1626 case 0x11: | |
1627 avctx->pix_fmt = PIX_FMT_YUV444P; | |
1628 break; | |
1629 case 0x21: | |
1630 avctx->pix_fmt = PIX_FMT_YUV422P; | |
1631 break; | |
1632 default: | |
1633 case 0x22: | |
1634 avctx->pix_fmt = PIX_FMT_YUV420P; | |
1635 break; | |
1636 } | |
1637 /* dummy quality */ | |
1638 /* XXX: infer it with matrix */ | |
903 | 1639 // avctx->quality = 3; |
881 | 1640 |
1641 return buf_ptr - buf; | |
1642 } | |
1643 | |
1644 | |
23 | 1645 static int mjpeg_decode_end(AVCodecContext *avctx) |
1646 { | |
1647 MJpegDecodeContext *s = avctx->priv_data; | |
1648 int i, j; | |
1649 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1650 av_free(s->buffer); |
23 | 1651 for(i=0;i<MAX_COMPONENTS;i++) |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
1652 av_free(s->current_picture[i]); |
23 | 1653 for(i=0;i<2;i++) { |
1654 for(j=0;j<4;j++) | |
1655 free_vlc(&s->vlcs[i][j]); | |
1656 } | |
1657 return 0; | |
1658 } | |
1659 | |
1660 AVCodec mjpeg_decoder = { | |
1661 "mjpeg", | |
1662 CODEC_TYPE_VIDEO, | |
1663 CODEC_ID_MJPEG, | |
1664 sizeof(MJpegDecodeContext), | |
1665 mjpeg_decode_init, | |
1666 NULL, | |
1667 mjpeg_decode_end, | |
1668 mjpeg_decode_frame, | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1669 0, |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1670 NULL |
23 | 1671 }; |
881 | 1672 |
1673 AVCodec mjpegb_decoder = { | |
1674 "mjpegb", | |
1675 CODEC_TYPE_VIDEO, | |
1676 CODEC_ID_MJPEGB, | |
1677 sizeof(MJpegDecodeContext), | |
1678 mjpeg_decode_init, | |
1679 NULL, | |
1680 mjpeg_decode_end, | |
1681 mjpegb_decode_frame, | |
1682 0, | |
1683 NULL | |
1684 }; |