Mercurial > libavcodec.hg
annotate mjpeg.c @ 704:9b35329086c7 libavcodec
An easy way to speed up encoding by 6%.
author | mellum |
---|---|
date | Sat, 28 Sep 2002 02:18:34 +0000 |
parents | c3bdb00a98a9 |
children | e65798d228ea |
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), |
20 * aspecting and various markers support | |
21 * by Alex Beregszaszi <alex@naxine.org> | |
0 | 22 */ |
76 | 23 //#define DEBUG |
0 | 24 #include "avcodec.h" |
25 #include "dsputil.h" | |
26 #include "mpegvideo.h" | |
27 | |
354 | 28 #ifdef USE_FASTMEMCPY |
29 #include "fastmemcpy.h" | |
30 #endif | |
31 | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
32 /* use two quantizer table (one for luminance and one for chrominance) */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
33 /* not yet working */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
34 #undef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
35 |
0 | 36 typedef struct MJpegContext { |
37 UINT8 huff_size_dc_luminance[12]; | |
38 UINT16 huff_code_dc_luminance[12]; | |
39 UINT8 huff_size_dc_chrominance[12]; | |
40 UINT16 huff_code_dc_chrominance[12]; | |
41 | |
42 UINT8 huff_size_ac_luminance[256]; | |
43 UINT16 huff_code_ac_luminance[256]; | |
44 UINT8 huff_size_ac_chrominance[256]; | |
45 UINT16 huff_code_ac_chrominance[256]; | |
46 } MJpegContext; | |
47 | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
48 /* JPEG marker codes */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
49 typedef enum { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
50 /* start of frame */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
51 SOF0 = 0xc0, /* baseline */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
52 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
|
53 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
|
54 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
|
55 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
56 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
|
57 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
|
58 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
|
59 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
|
60 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
|
61 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
|
62 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
|
63 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
64 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
|
65 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
|
66 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
|
67 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
68 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
|
69 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
70 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
|
71 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
72 /* 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
|
73 RST0 = 0xd0, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
74 RST1 = 0xd1, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
75 RST2 = 0xd2, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
76 RST3 = 0xd3, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
77 RST4 = 0xd4, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
78 RST5 = 0xd5, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
79 RST6 = 0xd6, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
80 RST7 = 0xd7, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
81 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
82 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
|
83 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
|
84 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
|
85 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
|
86 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
|
87 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
|
88 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
|
89 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
|
90 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
91 APP0 = 0xe0, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
92 APP1 = 0xe1, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
93 APP2 = 0xe2, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
94 APP3 = 0xe3, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
95 APP4 = 0xe4, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
96 APP5 = 0xe5, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
97 APP6 = 0xe6, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
98 APP7 = 0xe7, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
99 APP8 = 0xe8, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
100 APP9 = 0xe9, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
101 APP10 = 0xea, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
102 APP11 = 0xeb, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
103 APP12 = 0xec, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
104 APP13 = 0xed, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
105 APP14 = 0xee, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
106 APP15 = 0xef, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
107 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
108 JPG0 = 0xf0, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
109 JPG1 = 0xf1, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
110 JPG2 = 0xf2, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
111 JPG3 = 0xf3, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
112 JPG4 = 0xf4, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
113 JPG5 = 0xf5, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
114 JPG6 = 0xf6, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
115 JPG7 = 0xf7, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
116 JPG8 = 0xf8, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
117 JPG9 = 0xf9, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
118 JPG10 = 0xfa, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
119 JPG11 = 0xfb, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
120 JPG12 = 0xfc, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
121 JPG13 = 0xfd, |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
122 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
123 COM = 0xfe, /* comment */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
124 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
125 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
|
126 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
127 /* 0x02 -> 0xbf reserved */ |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
128 } JPEG_MARKER; |
0 | 129 |
130 #if 0 | |
131 /* These are the sample quantization tables given in JPEG spec section K.1. | |
132 * The spec says that the values given produce "good" quality, and | |
133 * when divided by 2, "very good" quality. | |
134 */ | |
135 static const unsigned char std_luminance_quant_tbl[64] = { | |
136 16, 11, 10, 16, 24, 40, 51, 61, | |
137 12, 12, 14, 19, 26, 58, 60, 55, | |
138 14, 13, 16, 24, 40, 57, 69, 56, | |
139 14, 17, 22, 29, 51, 87, 80, 62, | |
140 18, 22, 37, 56, 68, 109, 103, 77, | |
141 24, 35, 55, 64, 81, 104, 113, 92, | |
142 49, 64, 78, 87, 103, 121, 120, 101, | |
143 72, 92, 95, 98, 112, 100, 103, 99 | |
144 }; | |
145 static const unsigned char std_chrominance_quant_tbl[64] = { | |
146 17, 18, 24, 47, 99, 99, 99, 99, | |
147 18, 21, 26, 66, 99, 99, 99, 99, | |
148 24, 26, 56, 99, 99, 99, 99, 99, | |
149 47, 66, 99, 99, 99, 99, 99, 99, | |
150 99, 99, 99, 99, 99, 99, 99, 99, | |
151 99, 99, 99, 99, 99, 99, 99, 99, | |
152 99, 99, 99, 99, 99, 99, 99, 99, | |
153 99, 99, 99, 99, 99, 99, 99, 99 | |
154 }; | |
155 #endif | |
156 | |
157 /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ | |
158 /* IMPORTANT: these are only valid for 8-bit data precision! */ | |
159 static const UINT8 bits_dc_luminance[17] = | |
160 { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; | |
161 static const UINT8 val_dc_luminance[] = | |
162 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; | |
163 | |
164 static const UINT8 bits_dc_chrominance[17] = | |
165 { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; | |
166 static const UINT8 val_dc_chrominance[] = | |
167 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; | |
168 | |
169 static const UINT8 bits_ac_luminance[17] = | |
170 { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; | |
171 static const UINT8 val_ac_luminance[] = | |
172 { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, | |
173 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, | |
174 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, | |
175 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, | |
176 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, | |
177 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, | |
178 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, | |
179 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, | |
180 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, | |
181 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, | |
182 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, | |
183 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, | |
184 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, | |
185 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, | |
186 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, | |
187 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, | |
188 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, | |
189 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, | |
190 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, | |
191 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, | |
192 0xf9, 0xfa | |
193 }; | |
194 | |
195 static const UINT8 bits_ac_chrominance[17] = | |
196 { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; | |
197 | |
198 static const UINT8 val_ac_chrominance[] = | |
199 { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, | |
200 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, | |
201 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, | |
202 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, | |
203 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, | |
204 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, | |
205 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, | |
206 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, | |
207 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, | |
208 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, | |
209 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, | |
210 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, | |
211 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, | |
212 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, | |
213 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, | |
214 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, | |
215 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, | |
216 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, | |
217 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, | |
218 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, | |
219 0xf9, 0xfa | |
220 }; | |
221 | |
222 /* isn't this function nicer than the one in the libjpeg ? */ | |
223 static void build_huffman_codes(UINT8 *huff_size, UINT16 *huff_code, | |
224 const UINT8 *bits_table, const UINT8 *val_table) | |
225 { | |
226 int i, j, k,nb, code, sym; | |
227 | |
228 code = 0; | |
229 k = 0; | |
230 for(i=1;i<=16;i++) { | |
231 nb = bits_table[i]; | |
232 for(j=0;j<nb;j++) { | |
233 sym = val_table[k++]; | |
234 huff_size[sym] = i; | |
235 huff_code[sym] = code; | |
236 code++; | |
237 } | |
238 code <<= 1; | |
239 } | |
240 } | |
241 | |
242 int mjpeg_init(MpegEncContext *s) | |
243 { | |
244 MJpegContext *m; | |
245 | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
246 m = av_malloc(sizeof(MJpegContext)); |
0 | 247 if (!m) |
248 return -1; | |
344 | 249 |
250 s->min_qcoeff=-1023; | |
251 s->max_qcoeff= 1023; | |
357 | 252 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x |
0 | 253 |
254 /* build all the huffman tables */ | |
255 build_huffman_codes(m->huff_size_dc_luminance, | |
256 m->huff_code_dc_luminance, | |
257 bits_dc_luminance, | |
258 val_dc_luminance); | |
259 build_huffman_codes(m->huff_size_dc_chrominance, | |
260 m->huff_code_dc_chrominance, | |
261 bits_dc_chrominance, | |
262 val_dc_chrominance); | |
263 build_huffman_codes(m->huff_size_ac_luminance, | |
264 m->huff_code_ac_luminance, | |
265 bits_ac_luminance, | |
266 val_ac_luminance); | |
267 build_huffman_codes(m->huff_size_ac_chrominance, | |
268 m->huff_code_ac_chrominance, | |
269 bits_ac_chrominance, | |
270 val_ac_chrominance); | |
271 | |
272 s->mjpeg_ctx = m; | |
273 return 0; | |
274 } | |
275 | |
276 void mjpeg_close(MpegEncContext *s) | |
277 { | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
278 av_free(s->mjpeg_ctx); |
0 | 279 } |
280 | |
281 static inline void put_marker(PutBitContext *p, int code) | |
282 { | |
283 put_bits(p, 8, 0xff); | |
284 put_bits(p, 8, code); | |
285 } | |
286 | |
287 /* table_class: 0 = DC coef, 1 = AC coefs */ | |
288 static int put_huffman_table(MpegEncContext *s, int table_class, int table_id, | |
289 const UINT8 *bits_table, const UINT8 *value_table) | |
290 { | |
291 PutBitContext *p = &s->pb; | |
292 int n, i; | |
293 | |
294 put_bits(p, 4, table_class); | |
295 put_bits(p, 4, table_id); | |
296 | |
297 n = 0; | |
298 for(i=1;i<=16;i++) { | |
299 n += bits_table[i]; | |
300 put_bits(p, 8, bits_table[i]); | |
301 } | |
302 | |
303 for(i=0;i<n;i++) | |
304 put_bits(p, 8, value_table[i]); | |
305 | |
306 return n + 17; | |
307 } | |
308 | |
309 static void jpeg_table_header(MpegEncContext *s) | |
310 { | |
311 PutBitContext *p = &s->pb; | |
37 | 312 int i, j, size; |
0 | 313 UINT8 *ptr; |
314 | |
315 /* quant matrixes */ | |
316 put_marker(p, DQT); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
317 #ifdef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
318 put_bits(p, 16, 2 + 2 * (1 + 64)); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
319 #else |
0 | 320 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
|
321 #endif |
0 | 322 put_bits(p, 4, 0); /* 8 bit precision */ |
323 put_bits(p, 4, 0); /* table 0 */ | |
324 for(i=0;i<64;i++) { | |
37 | 325 j = zigzag_direct[i]; |
326 put_bits(p, 8, s->intra_matrix[j]); | |
0 | 327 } |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
328 #ifdef TWOMATRIXES |
0 | 329 put_bits(p, 4, 0); /* 8 bit precision */ |
330 put_bits(p, 4, 1); /* table 1 */ | |
331 for(i=0;i<64;i++) { | |
37 | 332 j = zigzag_direct[i]; |
333 put_bits(p, 8, s->chroma_intra_matrix[j]); | |
0 | 334 } |
335 #endif | |
336 | |
337 /* huffman table */ | |
338 put_marker(p, DHT); | |
339 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
|
340 ptr = pbBufPtr(p); |
0 | 341 put_bits(p, 16, 0); /* patched later */ |
342 size = 2; | |
343 size += put_huffman_table(s, 0, 0, bits_dc_luminance, val_dc_luminance); | |
344 size += put_huffman_table(s, 0, 1, bits_dc_chrominance, val_dc_chrominance); | |
345 | |
346 size += put_huffman_table(s, 1, 0, bits_ac_luminance, val_ac_luminance); | |
347 size += put_huffman_table(s, 1, 1, bits_ac_chrominance, val_ac_chrominance); | |
348 ptr[0] = size >> 8; | |
349 ptr[1] = size; | |
350 } | |
351 | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
352 static void jpeg_put_comments(MpegEncContext *s) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
353 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
354 PutBitContext *p = &s->pb; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
355 int size; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
356 UINT8 *ptr; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
357 |
672 | 358 if (s->aspect_ratio_info) |
359 { | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
360 /* JFIF header */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
361 put_marker(p, APP0); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
362 put_bits(p, 16, 16); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
363 put_string(p, "JFIF"); /* this puts the trailing zero-byte too */ |
672 | 364 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
|
365 put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ |
672 | 366 switch(s->aspect_ratio_info) |
367 { | |
368 case FF_ASPECT_4_3_625: | |
369 case FF_ASPECT_4_3_525: | |
370 put_bits(p, 16, 4); | |
371 put_bits(p, 16, 3); | |
372 break; | |
373 case FF_ASPECT_16_9_625: | |
374 case FF_ASPECT_16_9_525: | |
375 put_bits(p, 16, 16); | |
376 put_bits(p, 16, 9); | |
377 break; | |
378 case FF_ASPECT_EXTENDED: | |
379 put_bits(p, 16, s->aspected_width); | |
380 put_bits(p, 16, s->aspected_height); | |
381 break; | |
382 case FF_ASPECT_SQUARE: | |
383 default: | |
384 put_bits(p, 16, 1); /* aspect: 1:1 */ | |
385 put_bits(p, 16, 1); | |
386 break; | |
387 } | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
388 put_bits(p, 8, 0); /* thumbnail width */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
389 put_bits(p, 8, 0); /* thumbnail height */ |
672 | 390 } |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
391 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
392 /* comment */ |
676 | 393 if(!ff_bit_exact){ |
394 put_marker(p, COM); | |
395 flush_put_bits(p); | |
396 ptr = pbBufPtr(p); | |
397 put_bits(p, 16, 0); /* patched later */ | |
527 | 398 #define MJPEG_VERSION "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR |
676 | 399 put_string(p, MJPEG_VERSION); |
400 size = strlen(MJPEG_VERSION)+3; | |
527 | 401 #undef MJPEG_VERSION |
676 | 402 ptr[0] = size >> 8; |
403 ptr[1] = size; | |
404 } | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
405 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
406 |
0 | 407 void mjpeg_picture_header(MpegEncContext *s) |
408 { | |
409 put_marker(&s->pb, SOI); | |
410 | |
370
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
411 if (!s->mjpeg_data_only_frames) |
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
412 { |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
413 jpeg_put_comments(s); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
414 |
229 | 415 if (s->mjpeg_write_tables) jpeg_table_header(s); |
0 | 416 |
417 put_marker(&s->pb, SOF0); | |
418 | |
419 put_bits(&s->pb, 16, 17); | |
420 put_bits(&s->pb, 8, 8); /* 8 bits/component */ | |
421 put_bits(&s->pb, 16, s->height); | |
422 put_bits(&s->pb, 16, s->width); | |
423 put_bits(&s->pb, 8, 3); /* 3 components */ | |
424 | |
425 /* Y component */ | |
426 put_bits(&s->pb, 8, 1); /* component number */ | |
229 | 427 put_bits(&s->pb, 4, s->mjpeg_hsample[0]); /* H factor */ |
428 put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */ | |
0 | 429 put_bits(&s->pb, 8, 0); /* select matrix */ |
430 | |
431 /* Cb component */ | |
432 put_bits(&s->pb, 8, 2); /* component number */ | |
229 | 433 put_bits(&s->pb, 4, s->mjpeg_hsample[1]); /* H factor */ |
434 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
|
435 #ifdef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
436 put_bits(&s->pb, 8, 1); /* select matrix */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
437 #else |
0 | 438 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
|
439 #endif |
0 | 440 |
441 /* Cr component */ | |
442 put_bits(&s->pb, 8, 3); /* component number */ | |
229 | 443 put_bits(&s->pb, 4, s->mjpeg_hsample[2]); /* H factor */ |
444 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
|
445 #ifdef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
446 put_bits(&s->pb, 8, 1); /* select matrix */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
447 #else |
0 | 448 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
|
449 #endif |
370
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
450 } |
0 | 451 |
452 /* scan header */ | |
453 put_marker(&s->pb, SOS); | |
454 put_bits(&s->pb, 16, 12); /* length */ | |
455 put_bits(&s->pb, 8, 3); /* 3 components */ | |
456 | |
457 /* Y component */ | |
458 put_bits(&s->pb, 8, 1); /* index */ | |
459 put_bits(&s->pb, 4, 0); /* DC huffman table index */ | |
460 put_bits(&s->pb, 4, 0); /* AC huffman table index */ | |
461 | |
462 /* Cb component */ | |
463 put_bits(&s->pb, 8, 2); /* index */ | |
464 put_bits(&s->pb, 4, 1); /* DC huffman table index */ | |
465 put_bits(&s->pb, 4, 1); /* AC huffman table index */ | |
466 | |
467 /* Cr component */ | |
468 put_bits(&s->pb, 8, 3); /* index */ | |
469 put_bits(&s->pb, 4, 1); /* DC huffman table index */ | |
470 put_bits(&s->pb, 4, 1); /* AC huffman table index */ | |
471 | |
472 put_bits(&s->pb, 8, 0); /* Ss (not used) */ | |
473 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
|
474 put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */ |
0 | 475 } |
476 | |
477 void mjpeg_picture_trailer(MpegEncContext *s) | |
478 { | |
479 jflush_put_bits(&s->pb); | |
480 put_marker(&s->pb, EOI); | |
481 } | |
482 | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
483 static inline void mjpeg_encode_dc(MpegEncContext *s, int val, |
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
484 UINT8 *huff_size, UINT16 *huff_code) |
0 | 485 { |
486 int mant, nbits; | |
487 | |
488 if (val == 0) { | |
489 jput_bits(&s->pb, huff_size[0], huff_code[0]); | |
490 } else { | |
491 mant = val; | |
492 if (val < 0) { | |
493 val = -val; | |
494 mant--; | |
495 } | |
496 | |
497 /* compute the log (XXX: optimize) */ | |
498 nbits = 0; | |
499 while (val != 0) { | |
500 val = val >> 1; | |
501 nbits++; | |
502 } | |
503 | |
504 jput_bits(&s->pb, huff_size[nbits], huff_code[nbits]); | |
505 | |
506 jput_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); | |
507 } | |
508 } | |
509 | |
510 static void encode_block(MpegEncContext *s, DCTELEM *block, int n) | |
511 { | |
512 int mant, nbits, code, i, j; | |
513 int component, dc, run, last_index, val; | |
514 MJpegContext *m = s->mjpeg_ctx; | |
515 UINT8 *huff_size_ac; | |
516 UINT16 *huff_code_ac; | |
517 | |
518 /* DC coef */ | |
519 component = (n <= 3 ? 0 : n - 4 + 1); | |
520 dc = block[0]; /* overflow is impossible */ | |
521 val = dc - s->last_dc[component]; | |
522 if (n < 4) { | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
523 mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance); |
0 | 524 huff_size_ac = m->huff_size_ac_luminance; |
525 huff_code_ac = m->huff_code_ac_luminance; | |
526 } else { | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
527 mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); |
0 | 528 huff_size_ac = m->huff_size_ac_chrominance; |
529 huff_code_ac = m->huff_code_ac_chrominance; | |
530 } | |
531 s->last_dc[component] = dc; | |
532 | |
533 /* AC coefs */ | |
534 | |
535 run = 0; | |
536 last_index = s->block_last_index[n]; | |
537 for(i=1;i<=last_index;i++) { | |
538 j = zigzag_direct[i]; | |
539 val = block[j]; | |
540 if (val == 0) { | |
541 run++; | |
542 } else { | |
543 while (run >= 16) { | |
544 jput_bits(&s->pb, huff_size_ac[0xf0], huff_code_ac[0xf0]); | |
545 run -= 16; | |
546 } | |
547 mant = val; | |
548 if (val < 0) { | |
549 val = -val; | |
550 mant--; | |
551 } | |
552 | |
553 /* compute the log (XXX: optimize) */ | |
554 nbits = 0; | |
555 while (val != 0) { | |
556 val = val >> 1; | |
557 nbits++; | |
558 } | |
559 code = (run << 4) | nbits; | |
560 | |
561 jput_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]); | |
562 | |
563 jput_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); | |
564 run = 0; | |
565 } | |
566 } | |
567 | |
568 /* output EOB only if not already 64 values */ | |
569 if (last_index < 63 || run != 0) | |
570 jput_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]); | |
571 } | |
572 | |
573 void mjpeg_encode_mb(MpegEncContext *s, | |
574 DCTELEM block[6][64]) | |
575 { | |
576 int i; | |
577 for(i=0;i<6;i++) { | |
578 encode_block(s, block[i], i); | |
579 } | |
580 } | |
23 | 581 |
582 /******************************************/ | |
583 /* decoding */ | |
584 | |
585 /* compressed picture size */ | |
586 #define PICTURE_BUFFER_SIZE 100000 | |
587 | |
588 #define MAX_COMPONENTS 4 | |
589 | |
590 typedef struct MJpegDecodeContext { | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
591 AVCodecContext *avctx; |
23 | 592 GetBitContext gb; |
593 UINT32 header_state; | |
594 int start_code; /* current start code */ | |
595 UINT8 *buf_ptr; | |
596 int buffer_size; | |
597 int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ | |
598 INT16 quant_matrixes[4][64]; | |
599 VLC vlcs[2][4]; | |
53 | 600 |
601 int org_width, org_height; /* size given at codec init */ | |
602 int first_picture; /* true if decoding first picture */ | |
603 int interlaced; /* true if interlaced */ | |
604 int bottom_field; /* true if bottom field */ | |
605 | |
23 | 606 int width, height; |
26 | 607 int nb_components; |
608 int component_id[MAX_COMPONENTS]; | |
23 | 609 int h_count[MAX_COMPONENTS]; /* horizontal and vertical count for each component */ |
610 int v_count[MAX_COMPONENTS]; | |
611 int h_max, v_max; /* maximum h and v counts */ | |
612 int quant_index[4]; /* quant table index for each component */ | |
613 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */ | |
614 UINT8 *current_picture[MAX_COMPONENTS]; /* picture structure */ | |
615 int linesize[MAX_COMPONENTS]; | |
616 DCTELEM block[64] __align8; | |
617 UINT8 buffer[PICTURE_BUFFER_SIZE]; | |
354 | 618 |
619 int buggy_avid; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
620 int restart_interval; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
621 int restart_count; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
622 int interleaved_rows; |
23 | 623 } MJpegDecodeContext; |
624 | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
625 #define SKIP_REMAINING(gb, len) { \ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
626 dprintf("reamining %d bytes in marker\n", len); \ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
627 if (len) while (--len) \ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
628 skip_bits(gb, 8); \ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
629 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
630 |
375 | 631 static int mjpeg_decode_dht(MJpegDecodeContext *s, UINT8 *buf, int buf_size); |
632 | |
29 | 633 static void build_vlc(VLC *vlc, const UINT8 *bits_table, const UINT8 *val_table, |
634 int nb_codes) | |
635 { | |
636 UINT8 huff_size[256]; | |
637 UINT16 huff_code[256]; | |
638 | |
639 memset(huff_size, 0, sizeof(huff_size)); | |
640 build_huffman_codes(huff_size, huff_code, bits_table, val_table); | |
641 | |
642 init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2); | |
643 } | |
644 | |
23 | 645 static int mjpeg_decode_init(AVCodecContext *avctx) |
646 { | |
647 MJpegDecodeContext *s = avctx->priv_data; | |
648 | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
649 s->avctx = avctx; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
650 |
23 | 651 s->header_state = 0; |
652 s->mpeg_enc_ctx_allocated = 0; | |
653 s->buffer_size = PICTURE_BUFFER_SIZE - 1; /* minus 1 to take into | |
654 account FF 00 case */ | |
655 s->start_code = -1; | |
656 s->buf_ptr = s->buffer; | |
53 | 657 s->first_picture = 1; |
658 s->org_width = avctx->width; | |
659 s->org_height = avctx->height; | |
29 | 660 |
661 build_vlc(&s->vlcs[0][0], bits_dc_luminance, val_dc_luminance, 12); | |
662 build_vlc(&s->vlcs[0][1], bits_dc_chrominance, val_dc_chrominance, 12); | |
663 build_vlc(&s->vlcs[1][0], bits_ac_luminance, val_ac_luminance, 251); | |
664 build_vlc(&s->vlcs[1][1], bits_ac_chrominance, val_ac_chrominance, 251); | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
665 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
666 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
|
667 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
668 printf("mjpeg: using external huffman table\n"); |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
669 mjpeg_decode_dht(s, avctx->extradata, avctx->extradata_size); |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
670 /* 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
|
671 } |
23 | 672 return 0; |
673 } | |
674 | |
675 /* quantize tables */ | |
676 static int mjpeg_decode_dqt(MJpegDecodeContext *s, | |
677 UINT8 *buf, int buf_size) | |
678 { | |
37 | 679 int len, index, i, j; |
23 | 680 init_get_bits(&s->gb, buf, buf_size); |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
681 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
682 len = get_bits(&s->gb, 16) - 2; |
23 | 683 |
684 while (len >= 65) { | |
685 /* only 8 bit precision handled */ | |
686 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
|
687 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
688 dprintf("dqt: 16bit precision\n"); |
23 | 689 return -1; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
690 } |
23 | 691 index = get_bits(&s->gb, 4); |
692 if (index >= 4) | |
693 return -1; | |
694 dprintf("index=%d\n", index); | |
695 /* read quant table */ | |
37 | 696 for(i=0;i<64;i++) { |
697 j = zigzag_direct[i]; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
698 s->quant_matrixes[index][j] = get_bits(&s->gb, 8); |
37 | 699 } |
23 | 700 len -= 65; |
701 } | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
702 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
703 SKIP_REMAINING(&s->gb, len); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
704 |
23 | 705 return 0; |
706 } | |
707 | |
708 /* decode huffman tables and build VLC decoders */ | |
709 static int mjpeg_decode_dht(MJpegDecodeContext *s, | |
710 UINT8 *buf, int buf_size) | |
711 { | |
712 int len, index, i, class, n, v, code_max; | |
713 UINT8 bits_table[17]; | |
714 UINT8 val_table[256]; | |
715 | |
716 init_get_bits(&s->gb, buf, buf_size); | |
717 | |
718 len = get_bits(&s->gb, 16); | |
719 len -= 2; | |
720 | |
721 while (len > 0) { | |
722 if (len < 17) | |
723 return -1; | |
724 class = get_bits(&s->gb, 4); | |
725 if (class >= 2) | |
726 return -1; | |
727 index = get_bits(&s->gb, 4); | |
728 if (index >= 4) | |
729 return -1; | |
730 n = 0; | |
731 for(i=1;i<=16;i++) { | |
732 bits_table[i] = get_bits(&s->gb, 8); | |
733 n += bits_table[i]; | |
734 } | |
735 len -= 17; | |
736 if (len < n || n > 256) | |
737 return -1; | |
738 | |
739 code_max = 0; | |
740 for(i=0;i<n;i++) { | |
741 v = get_bits(&s->gb, 8); | |
742 if (v > code_max) | |
743 code_max = v; | |
744 val_table[i] = v; | |
745 } | |
746 len -= n; | |
747 | |
748 /* build VLC and flush previous vlc if present */ | |
749 free_vlc(&s->vlcs[class][index]); | |
750 dprintf("class=%d index=%d nb_codes=%d\n", | |
751 class, index, code_max + 1); | |
29 | 752 build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1); |
23 | 753 } |
754 return 0; | |
755 } | |
756 | |
757 static int mjpeg_decode_sof0(MJpegDecodeContext *s, | |
758 UINT8 *buf, int buf_size) | |
759 { | |
26 | 760 int len, nb_components, i, width, height; |
23 | 761 |
762 init_get_bits(&s->gb, buf, buf_size); | |
763 | |
764 /* XXX: verify len field validity */ | |
765 len = get_bits(&s->gb, 16); | |
766 /* only 8 bits/component accepted */ | |
767 if (get_bits(&s->gb, 8) != 8) | |
768 return -1; | |
769 height = get_bits(&s->gb, 16); | |
770 width = get_bits(&s->gb, 16); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
771 dprintf("sof0: picture: %dx%d\n", width, height); |
23 | 772 |
773 nb_components = get_bits(&s->gb, 8); | |
774 if (nb_components <= 0 || | |
775 nb_components > MAX_COMPONENTS) | |
776 return -1; | |
26 | 777 s->nb_components = nb_components; |
23 | 778 s->h_max = 1; |
779 s->v_max = 1; | |
780 for(i=0;i<nb_components;i++) { | |
781 /* component id */ | |
26 | 782 s->component_id[i] = get_bits(&s->gb, 8) - 1; |
23 | 783 s->h_count[i] = get_bits(&s->gb, 4); |
784 s->v_count[i] = get_bits(&s->gb, 4); | |
785 /* compute hmax and vmax (only used in interleaved case) */ | |
786 if (s->h_count[i] > s->h_max) | |
787 s->h_max = s->h_count[i]; | |
788 if (s->v_count[i] > s->v_max) | |
789 s->v_max = s->v_count[i]; | |
790 s->quant_index[i] = get_bits(&s->gb, 8); | |
791 if (s->quant_index[i] >= 4) | |
792 return -1; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
793 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
|
794 s->v_count[i], s->component_id[i], s->quant_index[i]); |
23 | 795 } |
796 | |
797 /* if different size, realloc/alloc picture */ | |
798 /* XXX: also check h_count and v_count */ | |
799 if (width != s->width || height != s->height) { | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
800 for(i=0;i<MAX_COMPONENTS;i++) |
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
801 av_freep(&s->current_picture[i]); |
23 | 802 s->width = width; |
803 s->height = height; | |
53 | 804 /* test interlaced mode */ |
805 if (s->first_picture && | |
806 s->org_height != 0 && | |
807 s->height < ((s->org_height * 3) / 4)) { | |
808 s->interlaced = 1; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
809 s->bottom_field = 0; |
53 | 810 } |
811 | |
23 | 812 for(i=0;i<nb_components;i++) { |
226 | 813 int w, h; |
814 w = (s->width + 8 * s->h_max - 1) / (8 * s->h_max); | |
815 h = (s->height + 8 * s->v_max - 1) / (8 * s->v_max); | |
816 w = w * 8 * s->h_count[i]; | |
817 h = h * 8 * s->v_count[i]; | |
53 | 818 if (s->interlaced) |
819 w *= 2; | |
23 | 820 s->linesize[i] = w; |
821 /* memory test is done in mjpeg_decode_sos() */ | |
822 s->current_picture[i] = av_mallocz(w * h); | |
823 } | |
53 | 824 s->first_picture = 0; |
23 | 825 } |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
826 |
354 | 827 if (len != (8+(3*nb_components))) |
828 { | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
829 dprintf("decode_sof0: error, len(%d) mismatch\n", len); |
354 | 830 } |
53 | 831 |
23 | 832 return 0; |
833 } | |
834 | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
835 static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index) |
23 | 836 { |
837 int code, diff; | |
838 | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
839 code = get_vlc(&s->gb, &s->vlcs[0][dc_index]); |
23 | 840 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
|
841 { |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
842 dprintf("mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index, |
427 | 843 &s->vlcs[0][dc_index]); |
23 | 844 return 0xffff; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
845 } |
23 | 846 if (code == 0) { |
847 diff = 0; | |
848 } else { | |
849 diff = get_bits(&s->gb, code); | |
850 if ((diff & (1 << (code - 1))) == 0) | |
851 diff = (-1 << code) | (diff + 1); | |
852 } | |
853 return diff; | |
854 } | |
855 | |
856 /* decode block and dequantize */ | |
857 static int decode_block(MJpegDecodeContext *s, DCTELEM *block, | |
858 int component, int dc_index, int ac_index, int quant_index) | |
859 { | |
860 int nbits, code, i, j, level; | |
861 int run, val; | |
862 VLC *ac_vlc; | |
863 INT16 *quant_matrix; | |
864 | |
865 /* DC coef */ | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
866 val = mjpeg_decode_dc(s, dc_index); |
23 | 867 if (val == 0xffff) { |
868 dprintf("error dc\n"); | |
869 return -1; | |
870 } | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
871 quant_matrix = s->quant_matrixes[quant_index]; |
23 | 872 val = val * quant_matrix[0] + s->last_dc[component]; |
873 s->last_dc[component] = val; | |
874 block[0] = val; | |
875 /* AC coefs */ | |
876 ac_vlc = &s->vlcs[1][ac_index]; | |
877 i = 1; | |
878 for(;;) { | |
879 code = get_vlc(&s->gb, ac_vlc); | |
880 if (code < 0) { | |
881 dprintf("error ac\n"); | |
882 return -1; | |
883 } | |
884 /* EOB */ | |
885 if (code == 0) | |
886 break; | |
887 if (code == 0xf0) { | |
888 i += 16; | |
889 } else { | |
890 run = code >> 4; | |
891 nbits = code & 0xf; | |
892 level = get_bits(&s->gb, nbits); | |
893 if ((level & (1 << (nbits - 1))) == 0) | |
894 level = (-1 << nbits) | (level + 1); | |
895 i += run; | |
896 if (i >= 64) { | |
897 dprintf("error count: %d\n", i); | |
898 return -1; | |
899 } | |
900 j = zigzag_direct[i]; | |
901 block[j] = level * quant_matrix[j]; | |
902 i++; | |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
903 if (i >= 64) |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
904 break; |
23 | 905 } |
906 } | |
907 return 0; | |
908 } | |
909 | |
910 static int mjpeg_decode_sos(MJpegDecodeContext *s, | |
911 UINT8 *buf, int buf_size) | |
912 { | |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
913 int len, nb_components, i, j, n, h, v, ret; |
26 | 914 int mb_width, mb_height, mb_x, mb_y, vmax, hmax, index, id; |
23 | 915 int comp_index[4]; |
916 int dc_index[4]; | |
917 int ac_index[4]; | |
918 int nb_blocks[4]; | |
919 int h_count[4]; | |
920 int v_count[4]; | |
921 | |
922 init_get_bits(&s->gb, buf, buf_size); | |
923 /* XXX: verify len field validity */ | |
924 len = get_bits(&s->gb, 16); | |
925 nb_components = get_bits(&s->gb, 8); | |
926 /* XXX: only interleaved scan accepted */ | |
927 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
|
928 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
929 dprintf("decode_sos: components(%d) mismatch\n", nb_components); |
23 | 930 return -1; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
931 } |
23 | 932 vmax = 0; |
933 hmax = 0; | |
934 for(i=0;i<nb_components;i++) { | |
26 | 935 id = get_bits(&s->gb, 8) - 1; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
936 dprintf("component: %d\n", id); |
26 | 937 /* find component index */ |
938 for(index=0;index<s->nb_components;index++) | |
939 if (id == s->component_id[index]) | |
940 break; | |
941 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
|
942 { |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
943 dprintf("decode_sos: index(%d) out of components\n", index); |
23 | 944 return -1; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
945 } |
26 | 946 |
23 | 947 comp_index[i] = index; |
948 nb_blocks[i] = s->h_count[index] * s->v_count[index]; | |
949 h_count[i] = s->h_count[index]; | |
950 v_count[i] = s->v_count[index]; | |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
951 |
23 | 952 dc_index[i] = get_bits(&s->gb, 4); |
953 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
|
954 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
955 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
|
956 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
|
957 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
|
958 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
|
959 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
960 case SOF0: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
961 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
|
962 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
|
963 break; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
964 case SOF1: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
965 case SOF2: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
966 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
|
967 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
|
968 break; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
969 case SOF3: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
970 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
|
971 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
|
972 break; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
973 } |
23 | 974 } |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
975 skip_bits(&s->gb, 8); /* Ss */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
976 skip_bits(&s->gb, 8); /* Se */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
977 skip_bits(&s->gb, 8); /* Ah and Al (each are 4 bits) */ |
23 | 978 |
979 for(i=0;i<nb_components;i++) | |
980 s->last_dc[i] = 1024; | |
981 | |
982 if (nb_components > 1) { | |
983 /* interleaved stream */ | |
984 mb_width = (s->width + s->h_max * 8 - 1) / (s->h_max * 8); | |
985 mb_height = (s->height + s->v_max * 8 - 1) / (s->v_max * 8); | |
986 } else { | |
987 h = s->h_max / s->h_count[comp_index[0]]; | |
988 v = s->v_max / s->v_count[comp_index[0]]; | |
989 mb_width = (s->width + h * 8 - 1) / (h * 8); | |
990 mb_height = (s->height + v * 8 - 1) / (v * 8); | |
991 nb_blocks[0] = 1; | |
992 h_count[0] = 1; | |
993 v_count[0] = 1; | |
994 } | |
995 | |
996 for(mb_y = 0; mb_y < mb_height; mb_y++) { | |
997 for(mb_x = 0; mb_x < mb_width; mb_x++) { | |
998 for(i=0;i<nb_components;i++) { | |
999 UINT8 *ptr; | |
1000 int x, y, c; | |
1001 n = nb_blocks[i]; | |
1002 c = comp_index[i]; | |
1003 h = h_count[i]; | |
1004 v = v_count[i]; | |
1005 x = 0; | |
1006 y = 0; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1007 if (s->restart_interval && !s->restart_count) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1008 s->restart_count = s->restart_interval; |
23 | 1009 for(j=0;j<n;j++) { |
1010 memset(s->block, 0, sizeof(s->block)); | |
1011 if (decode_block(s, s->block, i, | |
1012 dc_index[i], ac_index[i], | |
1013 s->quant_index[c]) < 0) { | |
427 | 1014 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
|
1015 ret = -1; |
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1016 goto the_end; |
23 | 1017 } |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1018 // dprintf("mb: %d %d processed\n", mb_y, mb_x); |
23 | 1019 ptr = s->current_picture[c] + |
1020 (s->linesize[c] * (v * mb_y + y) * 8) + | |
1021 (h * mb_x + x) * 8; | |
53 | 1022 if (s->interlaced && s->bottom_field) |
1023 ptr += s->linesize[c] >> 1; | |
477 | 1024 ff_idct_put(ptr, s->linesize[c], s->block); |
23 | 1025 if (++x == h) { |
1026 x = 0; | |
1027 y++; | |
1028 } | |
1029 } | |
1030 } | |
584
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1031 if (s->restart_interval && !--s->restart_count) { |
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1032 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
|
1033 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
|
1034 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
|
1035 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
|
1036 } |
23 | 1037 } |
1038 } | |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1039 ret = 0; |
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1040 the_end: |
44
92d51f683931
added forgotten emms() - fix various segmentation faults when using mjpeg
glantau
parents:
37
diff
changeset
|
1041 emms_c(); |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1042 return ret; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1043 out_of_range: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1044 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
|
1045 return -1; |
23 | 1046 } |
1047 | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1048 static int mjpeg_decode_dri(MJpegDecodeContext *s, |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1049 UINT8 *buf, int buf_size) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1050 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1051 init_get_bits(&s->gb, buf, buf_size); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1052 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1053 if (get_bits(&s->gb, 16) != 4) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1054 return -1; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1055 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
|
1056 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
|
1057 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1058 return 0; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1059 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1060 |
354 | 1061 #define FOURCC(a,b,c,d) ((a << 24) | (b << 16) | (c << 8) | d) |
1062 static int mjpeg_decode_app(MJpegDecodeContext *s, | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1063 UINT8 *buf, int buf_size, int start_code) |
354 | 1064 { |
1065 int len, id; | |
1066 | |
1067 init_get_bits(&s->gb, buf, buf_size); | |
1068 | |
1069 /* XXX: verify len field validity */ | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1070 len = get_bits(&s->gb, 16); |
354 | 1071 if (len < 5) |
1072 return -1; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1073 |
354 | 1074 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1075 len -= 6; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1076 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1077 /* buggy AVID, it puts EOI only at every 10th frame */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1078 /* also this fourcc is used by non-avid files too, it means |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1079 interleaving, but it's always present in AVID files */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1080 if (id == FOURCC('A','V','I','1')) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1081 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1082 /* structure: |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1083 4bytes AVI1 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1084 1bytes polarity |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1085 1bytes always zero |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1086 4bytes field_size |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1087 4bytes field_size_less_padding |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1088 */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1089 s->buggy_avid = 1; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1090 if (s->first_picture) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1091 printf("mjpeg: workarounding buggy AVID\n"); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1092 s->interleaved_rows = get_bits(&s->gb, 8); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1093 #if 0 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1094 skip_bits(&s->gb, 8); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1095 skip_bits(&s->gb, 32); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1096 skip_bits(&s->gb, 32); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1097 len -= 10; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1098 #endif |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1099 if (s->interleaved_rows) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1100 printf("mjpeg: interleaved rows: %d\n", s->interleaved_rows); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1101 goto out; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1102 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1103 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1104 len -= 2; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1105 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1106 if (id == FOURCC('J','F','I','F')) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1107 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1108 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
|
1109 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
|
1110 get_bits(&s->gb, 8), get_bits(&s->gb, 8)); |
672 | 1111 if (get_bits(&s->gb, 8) == 0) |
1112 { | |
1113 s->avctx->aspect_ratio_info = FF_ASPECT_EXTENDED; | |
1114 s->avctx->aspected_width = get_bits(&s->gb, 16); | |
1115 s->avctx->aspected_height = get_bits(&s->gb, 16); | |
1116 } | |
1117 else | |
1118 { | |
1119 skip_bits(&s->gb, 16); | |
1120 skip_bits(&s->gb, 16); | |
1121 } | |
1122 skip_bits(&s->gb, 8); | |
1123 skip_bits(&s->gb, 8); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1124 goto out; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1125 } |
354 | 1126 |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1127 /* Apple MJPEG-A */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1128 if ((start_code == APP1) && (len > (0x28 - 8))) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1129 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1130 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1131 len -= 4; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1132 if (id == FOURCC('m','j','p','g')) /* Apple MJPEG-A */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1133 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1134 #if 0 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1135 skip_bits(&s->gb, 32); /* field size */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1136 skip_bits(&s->gb, 32); /* pad field size */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1137 skip_bits(&s->gb, 32); /* next off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1138 skip_bits(&s->gb, 32); /* quant off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1139 skip_bits(&s->gb, 32); /* huff off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1140 skip_bits(&s->gb, 32); /* image off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1141 skip_bits(&s->gb, 32); /* scan off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1142 skip_bits(&s->gb, 32); /* data off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1143 #endif |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1144 if (s->first_picture) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1145 printf("mjpeg: Apple MJPEG-A header found\n"); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1146 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1147 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1148 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1149 out: |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1150 /* should check for further values.. */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1151 SKIP_REMAINING(&s->gb, len); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1152 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1153 return 0; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1154 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1155 #undef FOURCC |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1156 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1157 static int mjpeg_decode_com(MJpegDecodeContext *s, |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1158 UINT8 *buf, int buf_size) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1159 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1160 int len, i; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1161 UINT8 *cbuf; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1162 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1163 init_get_bits(&s->gb, buf, buf_size); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1164 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1165 /* XXX: verify len field validity */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1166 len = get_bits(&s->gb, 16)-2; |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
1167 cbuf = av_malloc(len+1); |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1168 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1169 for (i = 0; i < len; i++) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1170 cbuf[i] = get_bits(&s->gb, 8); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1171 if (cbuf[i-1] == '\n') |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1172 cbuf[i-1] = 0; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1173 else |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1174 cbuf[i] = 0; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1175 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1176 printf("mjpeg comment: '%s'\n", cbuf); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1177 |
354 | 1178 /* buggy avid, it puts EOI only at every 10th frame */ |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1179 if (!strcmp(cbuf, "AVID")) |
354 | 1180 { |
1181 s->buggy_avid = 1; | |
1182 if (s->first_picture) | |
1183 printf("mjpeg: workarounding buggy AVID\n"); | |
1184 } | |
1185 | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
1186 av_free(cbuf); |
354 | 1187 |
1188 return 0; | |
1189 } | |
1190 | |
23 | 1191 /* return the 8 bit start code value and update the search |
1192 state. Return -1 if no start code found */ | |
1193 static int find_marker(UINT8 **pbuf_ptr, UINT8 *buf_end, | |
1194 UINT32 *header_state) | |
1195 { | |
1196 UINT8 *buf_ptr; | |
1197 unsigned int state, v; | |
1198 int val; | |
1199 | |
1200 state = *header_state; | |
1201 buf_ptr = *pbuf_ptr; | |
584
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1202 retry: |
23 | 1203 if (state) { |
1204 /* get marker */ | |
1205 found: | |
1206 if (buf_ptr < buf_end) { | |
1207 val = *buf_ptr++; | |
1208 state = 0; | |
584
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1209 if ((val >= RST0) && (val <= RST7)) |
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1210 goto retry; |
23 | 1211 } else { |
1212 val = -1; | |
1213 } | |
1214 } else { | |
1215 while (buf_ptr < buf_end) { | |
1216 v = *buf_ptr++; | |
1217 if (v == 0xff) { | |
1218 state = 1; | |
1219 goto found; | |
1220 } | |
1221 } | |
1222 val = -1; | |
1223 } | |
1224 *pbuf_ptr = buf_ptr; | |
1225 *header_state = state; | |
1226 return val; | |
1227 } | |
1228 | |
1229 static int mjpeg_decode_frame(AVCodecContext *avctx, | |
1230 void *data, int *data_size, | |
1231 UINT8 *buf, int buf_size) | |
1232 { | |
1233 MJpegDecodeContext *s = avctx->priv_data; | |
1234 UINT8 *buf_end, *buf_ptr, *buf_start; | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1235 int len, code, input_size, i; |
23 | 1236 AVPicture *picture = data; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1237 unsigned int start_code; |
23 | 1238 |
68 | 1239 *data_size = 0; |
1240 | |
23 | 1241 /* no supplementary picture */ |
68 | 1242 if (buf_size == 0) |
23 | 1243 return 0; |
1244 | |
1245 buf_ptr = buf; | |
1246 buf_end = buf + buf_size; | |
1247 while (buf_ptr < buf_end) { | |
1248 buf_start = buf_ptr; | |
1249 /* find start next marker */ | |
1250 code = find_marker(&buf_ptr, buf_end, &s->header_state); | |
1251 /* copy to buffer */ | |
1252 len = buf_ptr - buf_start; | |
1253 if (len + (s->buf_ptr - s->buffer) > s->buffer_size) { | |
1254 /* data too big : flush */ | |
1255 s->buf_ptr = s->buffer; | |
1256 if (code > 0) | |
1257 s->start_code = code; | |
1258 } else { | |
1259 memcpy(s->buf_ptr, buf_start, len); | |
1260 s->buf_ptr += len; | |
427 | 1261 if (code < 0) { |
1262 /* nothing to do: wait next marker */ | |
1263 } else if (code == 0 || code == 0xff) { | |
1264 /* if we got FF 00, we copy FF to the stream to unescape FF 00 */ | |
1265 /* valid marker code is between 00 and ff - alex */ | |
23 | 1266 s->buf_ptr--; |
354 | 1267 } else { |
23 | 1268 /* prepare data for next start code */ |
1269 input_size = s->buf_ptr - s->buffer; | |
1270 start_code = s->start_code; | |
1271 s->buf_ptr = s->buffer; | |
1272 s->start_code = code; | |
44
92d51f683931
added forgotten emms() - fix various segmentation faults when using mjpeg
glantau
parents:
37
diff
changeset
|
1273 dprintf("marker=%x\n", start_code); |
23 | 1274 switch(start_code) { |
1275 case SOI: | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1276 s->restart_interval = 0; |
23 | 1277 /* nothing to do on SOI */ |
1278 break; | |
1279 case DQT: | |
1280 mjpeg_decode_dqt(s, s->buffer, input_size); | |
1281 break; | |
1282 case DHT: | |
1283 mjpeg_decode_dht(s, s->buffer, input_size); | |
1284 break; | |
1285 case SOF0: | |
1286 mjpeg_decode_sof0(s, s->buffer, input_size); | |
1287 break; | |
1288 case SOS: | |
1289 mjpeg_decode_sos(s, s->buffer, input_size); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1290 if (s->start_code == EOI || s->buggy_avid || s->restart_interval) { |
53 | 1291 int l; |
1292 if (s->interlaced) { | |
1293 s->bottom_field ^= 1; | |
1294 /* if not bottom field, do not output image yet */ | |
1295 if (s->bottom_field) | |
540
4cee7ce37e10
don't exit decoder after decoding first field -> fixes angels.avi interlacing
arpi_esp
parents:
527
diff
changeset
|
1296 goto not_the_end; |
53 | 1297 } |
23 | 1298 for(i=0;i<3;i++) { |
1299 picture->data[i] = s->current_picture[i]; | |
53 | 1300 l = s->linesize[i]; |
1301 if (s->interlaced) | |
1302 l >>= 1; | |
1303 picture->linesize[i] = l; | |
23 | 1304 } |
1305 *data_size = sizeof(AVPicture); | |
1306 avctx->height = s->height; | |
53 | 1307 if (s->interlaced) |
1308 avctx->height *= 2; | |
23 | 1309 avctx->width = s->width; |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1310 /* XXX: not complete test ! */ |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1311 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
|
1312 case 0x11: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1313 avctx->pix_fmt = PIX_FMT_YUV444P; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1314 break; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1315 case 0x21: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1316 avctx->pix_fmt = PIX_FMT_YUV422P; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1317 break; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1318 default: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1319 case 0x22: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1320 avctx->pix_fmt = PIX_FMT_YUV420P; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1321 break; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1322 } |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1323 /* dummy quality */ |
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1324 /* XXX: infer it with matrix */ |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1325 avctx->quality = 3; |
23 | 1326 goto the_end; |
1327 } | |
1328 break; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1329 case DRI: |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1330 mjpeg_decode_dri(s, s->buffer, input_size); |
354 | 1331 break; |
1332 case SOF1: | |
1333 case SOF2: | |
1334 case SOF3: | |
1335 case SOF5: | |
1336 case SOF6: | |
1337 case SOF7: | |
1338 case SOF9: | |
1339 case SOF10: | |
1340 case SOF11: | |
1341 case SOF13: | |
1342 case SOF14: | |
1343 case SOF15: | |
1344 case JPG: | |
1345 printf("mjpeg: unsupported coding type (%x)\n", start_code); | |
1346 return -1; | |
23 | 1347 } |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1348 #if 1 |
427 | 1349 if (start_code >= 0xd0 && start_code <= 0xd7) { |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1350 dprintf("restart marker: %d\n", start_code&0x0f); |
427 | 1351 } else if (s->first_picture) { |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1352 /* APP fields */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1353 if (start_code >= 0xe0 && start_code <= 0xef) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1354 mjpeg_decode_app(s, s->buffer, input_size, start_code); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1355 /* Comment */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1356 else if (start_code == COM) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1357 mjpeg_decode_com(s, s->buffer, input_size); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1358 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1359 #endif |
23 | 1360 } |
1361 } | |
540
4cee7ce37e10
don't exit decoder after decoding first field -> fixes angels.avi interlacing
arpi_esp
parents:
527
diff
changeset
|
1362 not_the_end: |
541 | 1363 ; |
23 | 1364 } |
1365 the_end: | |
1366 return buf_ptr - buf; | |
1367 } | |
1368 | |
1369 static int mjpeg_decode_end(AVCodecContext *avctx) | |
1370 { | |
1371 MJpegDecodeContext *s = avctx->priv_data; | |
1372 int i, j; | |
1373 | |
1374 for(i=0;i<MAX_COMPONENTS;i++) | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
1375 av_free(s->current_picture[i]); |
23 | 1376 for(i=0;i<2;i++) { |
1377 for(j=0;j<4;j++) | |
1378 free_vlc(&s->vlcs[i][j]); | |
1379 } | |
1380 return 0; | |
1381 } | |
1382 | |
1383 AVCodec mjpeg_decoder = { | |
1384 "mjpeg", | |
1385 CODEC_TYPE_VIDEO, | |
1386 CODEC_ID_MJPEG, | |
1387 sizeof(MJpegDecodeContext), | |
1388 mjpeg_decode_init, | |
1389 NULL, | |
1390 mjpeg_decode_end, | |
1391 mjpeg_decode_frame, | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1392 0, |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1393 NULL |
23 | 1394 }; |