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