Mercurial > libavcodec.hg
annotate mjpeg.c @ 1312:899c8f52094c libavcodec
10l
author | al3x |
---|---|
date | Mon, 16 Jun 2003 15:06:31 +0000 |
parents | b76927543aaf |
children | 6696d3bf4ff2 |
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 | |
1310 | 284 #define PREDICT(ret, topleft, top, left, predictor)\ |
285 switch(predictor){\ | |
286 case 1: ret= left; break;\ | |
287 case 2: ret= top; break;\ | |
288 case 3: ret= topleft; break;\ | |
289 case 4: ret= left + top - topleft; break;\ | |
290 case 5: ret= left + ((top - topleft)>>1); break;\ | |
291 case 6: ret= top + ((left - topleft)>>1); break;\ | |
292 case 7: ret= (left + top)>>1; break;\ | |
1307 | 293 } |
294 | |
0 | 295 static inline void put_marker(PutBitContext *p, int code) |
296 { | |
297 put_bits(p, 8, 0xff); | |
298 put_bits(p, 8, code); | |
299 } | |
300 | |
301 /* table_class: 0 = DC coef, 1 = AC coefs */ | |
302 static int put_huffman_table(MpegEncContext *s, int table_class, int table_id, | |
1064 | 303 const uint8_t *bits_table, const uint8_t *value_table) |
0 | 304 { |
305 PutBitContext *p = &s->pb; | |
306 int n, i; | |
307 | |
308 put_bits(p, 4, table_class); | |
309 put_bits(p, 4, table_id); | |
310 | |
311 n = 0; | |
312 for(i=1;i<=16;i++) { | |
313 n += bits_table[i]; | |
314 put_bits(p, 8, bits_table[i]); | |
315 } | |
316 | |
317 for(i=0;i<n;i++) | |
318 put_bits(p, 8, value_table[i]); | |
319 | |
320 return n + 17; | |
321 } | |
322 | |
323 static void jpeg_table_header(MpegEncContext *s) | |
324 { | |
325 PutBitContext *p = &s->pb; | |
37 | 326 int i, j, size; |
1064 | 327 uint8_t *ptr; |
0 | 328 |
329 /* quant matrixes */ | |
330 put_marker(p, DQT); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
331 #ifdef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
332 put_bits(p, 16, 2 + 2 * (1 + 64)); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
333 #else |
0 | 334 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
|
335 #endif |
0 | 336 put_bits(p, 4, 0); /* 8 bit precision */ |
337 put_bits(p, 4, 0); /* table 0 */ | |
338 for(i=0;i<64;i++) { | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
339 j = s->intra_scantable.permutated[i]; |
37 | 340 put_bits(p, 8, s->intra_matrix[j]); |
0 | 341 } |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
342 #ifdef TWOMATRIXES |
0 | 343 put_bits(p, 4, 0); /* 8 bit precision */ |
344 put_bits(p, 4, 1); /* table 1 */ | |
345 for(i=0;i<64;i++) { | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
346 j = s->intra_scantable.permutated[i]; |
37 | 347 put_bits(p, 8, s->chroma_intra_matrix[j]); |
0 | 348 } |
349 #endif | |
350 | |
351 /* huffman table */ | |
352 put_marker(p, DHT); | |
353 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
|
354 ptr = pbBufPtr(p); |
0 | 355 put_bits(p, 16, 0); /* patched later */ |
356 size = 2; | |
357 size += put_huffman_table(s, 0, 0, bits_dc_luminance, val_dc_luminance); | |
358 size += put_huffman_table(s, 0, 1, bits_dc_chrominance, val_dc_chrominance); | |
359 | |
360 size += put_huffman_table(s, 1, 0, bits_ac_luminance, val_ac_luminance); | |
361 size += put_huffman_table(s, 1, 1, bits_ac_chrominance, val_ac_chrominance); | |
362 ptr[0] = size >> 8; | |
363 ptr[1] = size; | |
364 } | |
365 | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
366 static void jpeg_put_comments(MpegEncContext *s) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
367 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
368 PutBitContext *p = &s->pb; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
369 int size; |
1064 | 370 uint8_t *ptr; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
371 |
672 | 372 if (s->aspect_ratio_info) |
373 { | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
374 /* JFIF header */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
375 put_marker(p, APP0); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
376 put_bits(p, 16, 16); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
377 put_string(p, "JFIF"); /* this puts the trailing zero-byte too */ |
672 | 378 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
|
379 put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ |
672 | 380 switch(s->aspect_ratio_info) |
381 { | |
382 case FF_ASPECT_4_3_625: | |
383 case FF_ASPECT_4_3_525: | |
384 put_bits(p, 16, 4); | |
385 put_bits(p, 16, 3); | |
386 break; | |
387 case FF_ASPECT_16_9_625: | |
388 case FF_ASPECT_16_9_525: | |
389 put_bits(p, 16, 16); | |
390 put_bits(p, 16, 9); | |
391 break; | |
392 case FF_ASPECT_EXTENDED: | |
393 put_bits(p, 16, s->aspected_width); | |
394 put_bits(p, 16, s->aspected_height); | |
395 break; | |
396 case FF_ASPECT_SQUARE: | |
397 default: | |
398 put_bits(p, 16, 1); /* aspect: 1:1 */ | |
399 put_bits(p, 16, 1); | |
400 break; | |
401 } | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
402 put_bits(p, 8, 0); /* thumbnail width */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
403 put_bits(p, 8, 0); /* thumbnail height */ |
672 | 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 /* comment */ |
1092 | 407 if(!(s->flags & CODEC_FLAG_BITEXACT)){ |
676 | 408 put_marker(p, COM); |
409 flush_put_bits(p); | |
410 ptr = pbBufPtr(p); | |
411 put_bits(p, 16, 0); /* patched later */ | |
1118 | 412 put_string(p, LIBAVCODEC_IDENT); |
413 size = strlen(LIBAVCODEC_IDENT)+3; | |
676 | 414 ptr[0] = size >> 8; |
415 ptr[1] = size; | |
416 } | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
417 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
418 |
0 | 419 void mjpeg_picture_header(MpegEncContext *s) |
420 { | |
421 put_marker(&s->pb, SOI); | |
422 | |
370
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
423 if (!s->mjpeg_data_only_frames) |
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
424 { |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
425 jpeg_put_comments(s); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
426 |
229 | 427 if (s->mjpeg_write_tables) jpeg_table_header(s); |
0 | 428 |
429 put_marker(&s->pb, SOF0); | |
430 | |
431 put_bits(&s->pb, 16, 17); | |
432 put_bits(&s->pb, 8, 8); /* 8 bits/component */ | |
433 put_bits(&s->pb, 16, s->height); | |
434 put_bits(&s->pb, 16, s->width); | |
435 put_bits(&s->pb, 8, 3); /* 3 components */ | |
436 | |
437 /* Y component */ | |
438 put_bits(&s->pb, 8, 1); /* component number */ | |
229 | 439 put_bits(&s->pb, 4, s->mjpeg_hsample[0]); /* H factor */ |
440 put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */ | |
0 | 441 put_bits(&s->pb, 8, 0); /* select matrix */ |
442 | |
443 /* Cb component */ | |
444 put_bits(&s->pb, 8, 2); /* component number */ | |
229 | 445 put_bits(&s->pb, 4, s->mjpeg_hsample[1]); /* H factor */ |
446 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
|
447 #ifdef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
448 put_bits(&s->pb, 8, 1); /* select matrix */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
449 #else |
0 | 450 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
|
451 #endif |
0 | 452 |
453 /* Cr component */ | |
454 put_bits(&s->pb, 8, 3); /* component number */ | |
229 | 455 put_bits(&s->pb, 4, s->mjpeg_hsample[2]); /* H factor */ |
456 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
|
457 #ifdef TWOMATRIXES |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
458 put_bits(&s->pb, 8, 1); /* select matrix */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
459 #else |
0 | 460 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
|
461 #endif |
370
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
462 } |
0 | 463 |
464 /* scan header */ | |
465 put_marker(&s->pb, SOS); | |
466 put_bits(&s->pb, 16, 12); /* length */ | |
467 put_bits(&s->pb, 8, 3); /* 3 components */ | |
468 | |
469 /* Y component */ | |
470 put_bits(&s->pb, 8, 1); /* index */ | |
471 put_bits(&s->pb, 4, 0); /* DC huffman table index */ | |
472 put_bits(&s->pb, 4, 0); /* AC huffman table index */ | |
473 | |
474 /* Cb component */ | |
475 put_bits(&s->pb, 8, 2); /* index */ | |
476 put_bits(&s->pb, 4, 1); /* DC huffman table index */ | |
477 put_bits(&s->pb, 4, 1); /* AC huffman table index */ | |
478 | |
479 /* Cr component */ | |
480 put_bits(&s->pb, 8, 3); /* index */ | |
481 put_bits(&s->pb, 4, 1); /* DC huffman table index */ | |
482 put_bits(&s->pb, 4, 1); /* AC huffman table index */ | |
483 | |
484 put_bits(&s->pb, 8, 0); /* Ss (not used) */ | |
485 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
|
486 put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */ |
0 | 487 } |
488 | |
841 | 489 static void escape_FF(MpegEncContext *s, int start) |
840 | 490 { |
841 | 491 int size= get_bit_count(&s->pb) - start*8; |
840 | 492 int i, ff_count; |
841 | 493 uint8_t *buf= s->pb.buf + start; |
1266 | 494 int align= (-(size_t)(buf))&3; |
840 | 495 |
496 assert((size&7) == 0); | |
497 size >>= 3; | |
498 | |
499 ff_count=0; | |
500 for(i=0; i<size && i<align; i++){ | |
501 if(buf[i]==0xFF) ff_count++; | |
502 } | |
503 for(; i<size-15; i+=16){ | |
504 int acc, v; | |
505 | |
506 v= *(uint32_t*)(&buf[i]); | |
507 acc= (((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
508 v= *(uint32_t*)(&buf[i+4]); | |
509 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
510 v= *(uint32_t*)(&buf[i+8]); | |
511 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
512 v= *(uint32_t*)(&buf[i+12]); | |
513 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
514 | |
515 acc>>=4; | |
516 acc+= (acc>>16); | |
517 acc+= (acc>>8); | |
518 ff_count+= acc&0xFF; | |
519 } | |
520 for(; i<size; i++){ | |
521 if(buf[i]==0xFF) ff_count++; | |
522 } | |
523 | |
524 if(ff_count==0) return; | |
525 | |
526 /* skip put bits */ | |
527 for(i=0; i<ff_count-3; i+=4) | |
528 put_bits(&s->pb, 32, 0); | |
529 put_bits(&s->pb, (ff_count-i)*8, 0); | |
530 flush_put_bits(&s->pb); | |
531 | |
532 for(i=size-1; ff_count; i--){ | |
533 int v= buf[i]; | |
534 | |
535 if(v==0xFF){ | |
536 //printf("%d %d\n", i, ff_count); | |
537 buf[i+ff_count]= 0; | |
538 ff_count--; | |
539 } | |
540 | |
541 buf[i+ff_count]= v; | |
542 } | |
543 } | |
544 | |
0 | 545 void mjpeg_picture_trailer(MpegEncContext *s) |
546 { | |
840 | 547 int pad= (-get_bit_count(&s->pb))&7; |
548 | |
549 put_bits(&s->pb, pad,0xFF>>(8-pad)); | |
550 flush_put_bits(&s->pb); | |
551 | |
841 | 552 assert((s->header_bits&7)==0); |
553 | |
554 escape_FF(s, s->header_bits>>3); | |
840 | 555 |
0 | 556 put_marker(&s->pb, EOI); |
557 } | |
558 | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
559 static inline void mjpeg_encode_dc(MpegEncContext *s, int val, |
1064 | 560 uint8_t *huff_size, uint16_t *huff_code) |
0 | 561 { |
562 int mant, nbits; | |
563 | |
564 if (val == 0) { | |
840 | 565 put_bits(&s->pb, huff_size[0], huff_code[0]); |
0 | 566 } else { |
567 mant = val; | |
568 if (val < 0) { | |
569 val = -val; | |
570 mant--; | |
571 } | |
572 | |
1280 | 573 nbits= av_log2(val) + 1; |
0 | 574 |
840 | 575 put_bits(&s->pb, huff_size[nbits], huff_code[nbits]); |
0 | 576 |
840 | 577 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); |
0 | 578 } |
579 } | |
580 | |
581 static void encode_block(MpegEncContext *s, DCTELEM *block, int n) | |
582 { | |
583 int mant, nbits, code, i, j; | |
584 int component, dc, run, last_index, val; | |
585 MJpegContext *m = s->mjpeg_ctx; | |
1064 | 586 uint8_t *huff_size_ac; |
587 uint16_t *huff_code_ac; | |
0 | 588 |
589 /* DC coef */ | |
590 component = (n <= 3 ? 0 : n - 4 + 1); | |
591 dc = block[0]; /* overflow is impossible */ | |
592 val = dc - s->last_dc[component]; | |
593 if (n < 4) { | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
594 mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance); |
0 | 595 huff_size_ac = m->huff_size_ac_luminance; |
596 huff_code_ac = m->huff_code_ac_luminance; | |
597 } else { | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
598 mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); |
0 | 599 huff_size_ac = m->huff_size_ac_chrominance; |
600 huff_code_ac = m->huff_code_ac_chrominance; | |
601 } | |
602 s->last_dc[component] = dc; | |
603 | |
604 /* AC coefs */ | |
605 | |
606 run = 0; | |
607 last_index = s->block_last_index[n]; | |
608 for(i=1;i<=last_index;i++) { | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
609 j = s->intra_scantable.permutated[i]; |
0 | 610 val = block[j]; |
611 if (val == 0) { | |
612 run++; | |
613 } else { | |
614 while (run >= 16) { | |
840 | 615 put_bits(&s->pb, huff_size_ac[0xf0], huff_code_ac[0xf0]); |
0 | 616 run -= 16; |
617 } | |
618 mant = val; | |
619 if (val < 0) { | |
620 val = -val; | |
621 mant--; | |
622 } | |
623 | |
1280 | 624 nbits= av_log2(val) + 1; |
0 | 625 code = (run << 4) | nbits; |
626 | |
840 | 627 put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]); |
0 | 628 |
840 | 629 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); |
0 | 630 run = 0; |
631 } | |
632 } | |
633 | |
634 /* output EOB only if not already 64 values */ | |
635 if (last_index < 63 || run != 0) | |
840 | 636 put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]); |
0 | 637 } |
638 | |
639 void mjpeg_encode_mb(MpegEncContext *s, | |
640 DCTELEM block[6][64]) | |
641 { | |
642 int i; | |
643 for(i=0;i<6;i++) { | |
644 encode_block(s, block[i], i); | |
645 } | |
646 } | |
23 | 647 |
648 /******************************************/ | |
649 /* decoding */ | |
650 | |
651 #define MAX_COMPONENTS 4 | |
652 | |
653 typedef struct MJpegDecodeContext { | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
654 AVCodecContext *avctx; |
23 | 655 GetBitContext gb; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
656 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
|
657 |
23 | 658 int start_code; /* current start code */ |
659 int buffer_size; | |
1064 | 660 uint8_t *buffer; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
661 |
1064 | 662 int16_t quant_matrixes[4][64]; |
23 | 663 VLC vlcs[2][4]; |
53 | 664 |
665 int org_width, org_height; /* size given at codec init */ | |
666 int first_picture; /* true if decoding first picture */ | |
667 int interlaced; /* true if interlaced */ | |
668 int bottom_field; /* true if bottom field */ | |
1307 | 669 int lossless; |
670 int rgb; | |
1310 | 671 int rct; /* pegasus reversible colorspace transform */ |
672 int bits; /* bits per component */ | |
53 | 673 |
23 | 674 int width, height; |
26 | 675 int nb_components; |
676 int component_id[MAX_COMPONENTS]; | |
23 | 677 int h_count[MAX_COMPONENTS]; /* horizontal and vertical count for each component */ |
678 int v_count[MAX_COMPONENTS]; | |
679 int h_max, v_max; /* maximum h and v counts */ | |
680 int quant_index[4]; /* quant table index for each component */ | |
681 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */ | |
1064 | 682 uint8_t *current_picture[MAX_COMPONENTS]; /* picture structure */ |
23 | 683 int linesize[MAX_COMPONENTS]; |
684 DCTELEM block[64] __align8; | |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
685 ScanTable scantable; |
1064 | 686 void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/); |
354 | 687 |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
688 int restart_interval; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
689 int restart_count; |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
690 |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
691 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
|
692 int interlace_polarity; |
23 | 693 } MJpegDecodeContext; |
694 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
695 static int mjpeg_decode_dht(MJpegDecodeContext *s); |
375 | 696 |
1064 | 697 static void build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table, |
29 | 698 int nb_codes) |
699 { | |
1064 | 700 uint8_t huff_size[256]; |
701 uint16_t huff_code[256]; | |
29 | 702 |
703 memset(huff_size, 0, sizeof(huff_size)); | |
704 build_huffman_codes(huff_size, huff_code, bits_table, val_table); | |
705 | |
706 init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2); | |
707 } | |
708 | |
23 | 709 static int mjpeg_decode_init(AVCodecContext *avctx) |
710 { | |
711 MJpegDecodeContext *s = avctx->priv_data; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
712 MpegEncContext s2; |
23 | 713 |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
714 s->avctx = avctx; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
715 |
1092 | 716 /* 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
|
717 memset(&s2, 0, sizeof(MpegEncContext)); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
718 s2.flags= avctx->flags; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
719 s2.avctx= avctx; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
720 // s2->out_format = FMT_MJPEG; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
721 s2.width = 8; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
722 s2.height = 8; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
723 if (MPV_common_init(&s2) < 0) |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
724 return -1; |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
725 s->scantable= s2.intra_scantable; |
1092 | 726 s->idct_put= s2.dsp.idct_put; |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
727 MPV_common_end(&s2); |
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
728 |
23 | 729 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
|
730 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
|
731 but photojpg files could ahive bigger sizes */ |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
732 s->buffer = av_malloc(s->buffer_size); |
935 | 733 if (!s->buffer) |
734 return -1; | |
23 | 735 s->start_code = -1; |
53 | 736 s->first_picture = 1; |
737 s->org_width = avctx->width; | |
738 s->org_height = avctx->height; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
739 |
29 | 740 build_vlc(&s->vlcs[0][0], bits_dc_luminance, val_dc_luminance, 12); |
741 build_vlc(&s->vlcs[0][1], bits_dc_chrominance, val_dc_chrominance, 12); | |
742 build_vlc(&s->vlcs[1][0], bits_ac_luminance, val_ac_luminance, 251); | |
743 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
|
744 |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
745 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
|
746 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
747 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
|
748 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
|
749 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
|
750 /* 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
|
751 } |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
752 |
23 | 753 return 0; |
754 } | |
755 | |
756 /* quantize tables */ | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
757 static int mjpeg_decode_dqt(MJpegDecodeContext *s) |
23 | 758 { |
37 | 759 int len, index, i, j; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
760 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
761 len = get_bits(&s->gb, 16) - 2; |
23 | 762 |
763 while (len >= 65) { | |
764 /* only 8 bit precision handled */ | |
765 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
|
766 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
767 dprintf("dqt: 16bit precision\n"); |
23 | 768 return -1; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
769 } |
23 | 770 index = get_bits(&s->gb, 4); |
771 if (index >= 4) | |
772 return -1; | |
773 dprintf("index=%d\n", index); | |
774 /* read quant table */ | |
37 | 775 for(i=0;i<64;i++) { |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
776 j = s->scantable.permutated[i]; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
777 s->quant_matrixes[index][j] = get_bits(&s->gb, 8); |
37 | 778 } |
23 | 779 len -= 65; |
780 } | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
781 |
23 | 782 return 0; |
783 } | |
784 | |
785 /* decode huffman tables and build VLC decoders */ | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
786 static int mjpeg_decode_dht(MJpegDecodeContext *s) |
23 | 787 { |
788 int len, index, i, class, n, v, code_max; | |
1064 | 789 uint8_t bits_table[17]; |
790 uint8_t val_table[256]; | |
23 | 791 |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
792 len = get_bits(&s->gb, 16) - 2; |
23 | 793 |
794 while (len > 0) { | |
795 if (len < 17) | |
796 return -1; | |
797 class = get_bits(&s->gb, 4); | |
798 if (class >= 2) | |
799 return -1; | |
800 index = get_bits(&s->gb, 4); | |
801 if (index >= 4) | |
802 return -1; | |
803 n = 0; | |
804 for(i=1;i<=16;i++) { | |
805 bits_table[i] = get_bits(&s->gb, 8); | |
806 n += bits_table[i]; | |
807 } | |
808 len -= 17; | |
809 if (len < n || n > 256) | |
810 return -1; | |
811 | |
812 code_max = 0; | |
813 for(i=0;i<n;i++) { | |
814 v = get_bits(&s->gb, 8); | |
815 if (v > code_max) | |
816 code_max = v; | |
817 val_table[i] = v; | |
818 } | |
819 len -= n; | |
820 | |
821 /* build VLC and flush previous vlc if present */ | |
822 free_vlc(&s->vlcs[class][index]); | |
823 dprintf("class=%d index=%d nb_codes=%d\n", | |
824 class, index, code_max + 1); | |
29 | 825 build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1); |
23 | 826 } |
827 return 0; | |
828 } | |
829 | |
1307 | 830 static int mjpeg_decode_sof(MJpegDecodeContext *s) |
23 | 831 { |
26 | 832 int len, nb_components, i, width, height; |
23 | 833 |
834 /* XXX: verify len field validity */ | |
835 len = get_bits(&s->gb, 16); | |
1310 | 836 s->bits= get_bits(&s->gb, 8); |
837 if(s->rct) s->bits=9; | |
838 | |
839 if (s->bits != 8 && !s->lossless){ | |
1307 | 840 printf("only 8 bits/component accepted\n"); |
23 | 841 return -1; |
1307 | 842 } |
23 | 843 height = get_bits(&s->gb, 16); |
844 width = get_bits(&s->gb, 16); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
845 dprintf("sof0: picture: %dx%d\n", width, height); |
23 | 846 |
847 nb_components = get_bits(&s->gb, 8); | |
848 if (nb_components <= 0 || | |
849 nb_components > MAX_COMPONENTS) | |
850 return -1; | |
26 | 851 s->nb_components = nb_components; |
23 | 852 s->h_max = 1; |
853 s->v_max = 1; | |
854 for(i=0;i<nb_components;i++) { | |
855 /* component id */ | |
26 | 856 s->component_id[i] = get_bits(&s->gb, 8) - 1; |
23 | 857 s->h_count[i] = get_bits(&s->gb, 4); |
858 s->v_count[i] = get_bits(&s->gb, 4); | |
859 /* compute hmax and vmax (only used in interleaved case) */ | |
860 if (s->h_count[i] > s->h_max) | |
861 s->h_max = s->h_count[i]; | |
862 if (s->v_count[i] > s->v_max) | |
863 s->v_max = s->v_count[i]; | |
864 s->quant_index[i] = get_bits(&s->gb, 8); | |
865 if (s->quant_index[i] >= 4) | |
866 return -1; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
867 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
|
868 s->v_count[i], s->component_id[i], s->quant_index[i]); |
23 | 869 } |
1310 | 870 |
871 if(s->v_max==1 && s->h_max==1 && s->lossless==1) s->rgb=1; | |
23 | 872 |
873 /* if different size, realloc/alloc picture */ | |
874 /* XXX: also check h_count and v_count */ | |
875 if (width != s->width || height != s->height) { | |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
876 for(i=0;i<MAX_COMPONENTS;i++) |
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
877 av_freep(&s->current_picture[i]); |
23 | 878 s->width = width; |
879 s->height = height; | |
53 | 880 /* test interlaced mode */ |
881 if (s->first_picture && | |
882 s->org_height != 0 && | |
883 s->height < ((s->org_height * 3) / 4)) { | |
884 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
|
885 // 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
|
886 s->bottom_field = 0; |
53 | 887 } |
888 | |
1307 | 889 if(s->rgb){ |
890 int w, h; | |
891 w = s->width; | |
892 h = s->height; | |
893 if (s->interlaced) | |
894 w *= 2; | |
895 s->linesize[0] = 4*w; | |
896 s->current_picture[0] = av_mallocz(4*w * h); | |
897 s->current_picture[1] = s->current_picture[2] = NULL; | |
898 }else{ | |
899 for(i=0;i<nb_components;i++) { | |
226 | 900 int w, h; |
901 w = (s->width + 8 * s->h_max - 1) / (8 * s->h_max); | |
902 h = (s->height + 8 * s->v_max - 1) / (8 * s->v_max); | |
903 w = w * 8 * s->h_count[i]; | |
904 h = h * 8 * s->v_count[i]; | |
53 | 905 if (s->interlaced) |
906 w *= 2; | |
23 | 907 s->linesize[i] = w; |
908 s->current_picture[i] = av_mallocz(w * h); | |
901 | 909 if (!s->current_picture[i]) |
910 { | |
911 dprintf("error: no picture buffers allocated\n"); | |
912 return -1; | |
913 } | |
1307 | 914 } |
23 | 915 } |
53 | 916 s->first_picture = 0; |
23 | 917 } |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
918 |
354 | 919 if (len != (8+(3*nb_components))) |
920 { | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
921 dprintf("decode_sof0: error, len(%d) mismatch\n", len); |
354 | 922 } |
53 | 923 |
23 | 924 return 0; |
925 } | |
926 | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
927 static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index) |
23 | 928 { |
1280 | 929 int code; |
780 | 930 code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2); |
23 | 931 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
|
932 { |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
933 dprintf("mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index, |
427 | 934 &s->vlcs[0][dc_index]); |
23 | 935 return 0xffff; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
936 } |
1280 | 937 |
938 if(code) | |
939 return get_xbits(&s->gb, code); | |
940 else | |
941 return 0; | |
23 | 942 } |
943 | |
944 /* decode block and dequantize */ | |
945 static int decode_block(MJpegDecodeContext *s, DCTELEM *block, | |
946 int component, int dc_index, int ac_index, int quant_index) | |
947 { | |
1280 | 948 int code, i, j, level, val; |
23 | 949 VLC *ac_vlc; |
1064 | 950 int16_t *quant_matrix; |
23 | 951 |
952 /* DC coef */ | |
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
953 val = mjpeg_decode_dc(s, dc_index); |
23 | 954 if (val == 0xffff) { |
955 dprintf("error dc\n"); | |
956 return -1; | |
957 } | |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
958 quant_matrix = s->quant_matrixes[quant_index]; |
23 | 959 val = val * quant_matrix[0] + s->last_dc[component]; |
960 s->last_dc[component] = val; | |
961 block[0] = val; | |
962 /* AC coefs */ | |
963 ac_vlc = &s->vlcs[1][ac_index]; | |
964 i = 1; | |
965 for(;;) { | |
780 | 966 code = get_vlc2(&s->gb, s->vlcs[1][ac_index].table, 9, 2); |
1275 | 967 |
23 | 968 if (code < 0) { |
969 dprintf("error ac\n"); | |
970 return -1; | |
971 } | |
972 /* EOB */ | |
973 if (code == 0) | |
974 break; | |
975 if (code == 0xf0) { | |
976 i += 16; | |
977 } else { | |
1280 | 978 level = get_xbits(&s->gb, code & 0xf); |
979 i += code >> 4; | |
23 | 980 if (i >= 64) { |
981 dprintf("error count: %d\n", i); | |
982 return -1; | |
983 } | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
984 j = s->scantable.permutated[i]; |
23 | 985 block[j] = level * quant_matrix[j]; |
986 i++; | |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
987 if (i >= 64) |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
988 break; |
23 | 989 } |
990 } | |
991 return 0; | |
992 } | |
993 | |
1307 | 994 static void decode_lossless(MJpegDecodeContext *s, int point_transform, int predictor){ |
995 } | |
996 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
997 static int mjpeg_decode_sos(MJpegDecodeContext *s) |
23 | 998 { |
1307 | 999 int len, nb_components, i, j, n, h, v, ret, point_transform, predictor; |
26 | 1000 int mb_width, mb_height, mb_x, mb_y, vmax, hmax, index, id; |
23 | 1001 int comp_index[4]; |
1002 int dc_index[4]; | |
1003 int ac_index[4]; | |
1004 int nb_blocks[4]; | |
1005 int h_count[4]; | |
1006 int v_count[4]; | |
1307 | 1007 const int block_size= s->lossless ? 1 : 8; |
1008 | |
23 | 1009 /* XXX: verify len field validity */ |
1010 len = get_bits(&s->gb, 16); | |
1011 nb_components = get_bits(&s->gb, 8); | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1012 if (len != 6+2*nb_components) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1013 { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1014 dprintf("decode_sos: invalid len (%d)\n", len); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1015 return -1; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1016 } |
23 | 1017 /* XXX: only interleaved scan accepted */ |
1018 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
|
1019 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1020 dprintf("decode_sos: components(%d) mismatch\n", nb_components); |
23 | 1021 return -1; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1022 } |
23 | 1023 vmax = 0; |
1024 hmax = 0; | |
1025 for(i=0;i<nb_components;i++) { | |
26 | 1026 id = get_bits(&s->gb, 8) - 1; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1027 dprintf("component: %d\n", id); |
26 | 1028 /* find component index */ |
1029 for(index=0;index<s->nb_components;index++) | |
1030 if (id == s->component_id[index]) | |
1031 break; | |
1032 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
|
1033 { |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1034 dprintf("decode_sos: index(%d) out of components\n", index); |
23 | 1035 return -1; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1036 } |
26 | 1037 |
23 | 1038 comp_index[i] = index; |
1310 | 1039 |
23 | 1040 nb_blocks[i] = s->h_count[index] * s->v_count[index]; |
1041 h_count[i] = s->h_count[index]; | |
1042 v_count[i] = s->v_count[index]; | |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1043 |
23 | 1044 dc_index[i] = get_bits(&s->gb, 4); |
1045 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
|
1046 |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1047 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
|
1048 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
|
1049 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
|
1050 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
|
1051 { |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1052 case SOF0: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1053 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
|
1054 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
|
1055 break; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1056 case SOF1: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1057 case SOF2: |
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] > 3) |
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 case SOF3: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1062 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
|
1063 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
|
1064 break; |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1065 } |
23 | 1066 } |
1310 | 1067 |
1307 | 1068 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
|
1069 skip_bits(&s->gb, 8); /* Se */ |
1307 | 1070 skip_bits(&s->gb, 4); /* Ah */ |
1071 point_transform= get_bits(&s->gb, 4); /* Al */ | |
23 | 1072 |
1073 for(i=0;i<nb_components;i++) | |
1074 s->last_dc[i] = 1024; | |
1075 | |
1076 if (nb_components > 1) { | |
1077 /* interleaved stream */ | |
1307 | 1078 mb_width = (s->width + s->h_max * block_size - 1) / (s->h_max * block_size); |
1079 mb_height = (s->height + s->v_max * block_size - 1) / (s->v_max * block_size); | |
23 | 1080 } else { |
1081 h = s->h_max / s->h_count[comp_index[0]]; | |
1082 v = s->v_max / s->v_count[comp_index[0]]; | |
1307 | 1083 mb_width = (s->width + h * block_size - 1) / (h * block_size); |
1084 mb_height = (s->height + v * block_size - 1) / (v * block_size); | |
23 | 1085 nb_blocks[0] = 1; |
1086 h_count[0] = 1; | |
1087 v_count[0] = 1; | |
1088 } | |
1307 | 1089 |
1310 | 1090 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
1091 printf("%s %s p:%d >>:%d\n", s->lossless ? "lossless" : "sequencial DCT", s->rgb ? "RGB" : "", predictor, point_transform); | |
1092 | |
1307 | 1093 if(s->lossless){ |
1310 | 1094 if(s->rgb){ |
1095 uint16_t buffer[2048][4]; | |
1096 int left[3], top[3], topleft[3]; | |
1307 | 1097 const int linesize= s->linesize[0]; |
1310 | 1098 const int mask= (1<<s->bits)-1; |
1099 | |
1100 for(i=0; i<3; i++){ | |
1101 buffer[0][i]= 1 << (s->bits + point_transform - 1); | |
1102 } | |
1307 | 1103 for(mb_y = 0; mb_y < mb_height; mb_y++) { |
1310 | 1104 const int modified_predictor= mb_y ? 1 : predictor; |
1105 uint8_t *ptr = s->current_picture[0] + (linesize * mb_y); | |
1106 | |
1107 if (s->interlaced && s->bottom_field) | |
1108 ptr += linesize >> 1; | |
1109 | |
1110 for(i=0; i<3; i++){ | |
1111 top[i]= left[i]= topleft[i]= buffer[0][i]; | |
1112 } | |
1307 | 1113 for(mb_x = 0; mb_x < mb_width; mb_x++) { |
1114 if (s->restart_interval && !s->restart_count) | |
1115 s->restart_count = s->restart_interval; | |
1116 | |
1310 | 1117 for(i=0;i<3;i++) { |
1118 int pred; | |
1307 | 1119 |
1310 | 1120 PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); |
1121 | |
1122 topleft[i]= top[i]; | |
1123 top[i]= buffer[mb_x][i]; | |
1124 | |
1125 left[i]= | |
1126 buffer[mb_x][i]= mask & (pred + (mjpeg_decode_dc(s, dc_index[i]) << point_transform)); | |
1127 } | |
1307 | 1128 |
1310 | 1129 if (s->restart_interval && !--s->restart_count) { |
1307 | 1130 align_get_bits(&s->gb); |
1131 skip_bits(&s->gb, 16); /* skip RSTn */ | |
1132 } | |
1133 } | |
1310 | 1134 |
1135 if(s->rct){ | |
1136 for(mb_x = 0; mb_x < mb_width; mb_x++) { | |
1137 ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2])>>2); | |
1138 ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1]; | |
1139 ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1]; | |
1140 } | |
1141 }else{ | |
1142 for(mb_x = 0; mb_x < mb_width; mb_x++) { | |
1143 ptr[4*mb_x+0] = buffer[mb_x][0]; | |
1144 ptr[4*mb_x+1] = buffer[mb_x][1]; | |
1145 ptr[4*mb_x+2] = buffer[mb_x][2]; | |
1146 } | |
1147 } | |
1307 | 1148 } |
1149 }else{ | |
1150 for(mb_y = 0; mb_y < mb_height; mb_y++) { | |
1151 for(mb_x = 0; mb_x < mb_width; mb_x++) { | |
1152 if (s->restart_interval && !s->restart_count) | |
1153 s->restart_count = s->restart_interval; | |
1154 | |
1310 | 1155 if(mb_x==0 || mb_y==0 || s->interlaced){ |
1307 | 1156 for(i=0;i<nb_components;i++) { |
1157 uint8_t *ptr; | |
1158 int x, y, c, linesize; | |
1159 n = nb_blocks[i]; | |
1160 c = comp_index[i]; | |
1161 h = h_count[i]; | |
1162 v = v_count[i]; | |
1163 x = 0; | |
1164 y = 0; | |
1165 linesize= s->linesize[c]; | |
1166 | |
1167 for(j=0; j<n; j++) { | |
1168 int pred; | |
1169 | |
1170 ptr = s->current_picture[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap | |
1171 if(y==0 && mb_y==0){ | |
1172 if(x==0 && mb_x==0){ | |
1173 pred= 128 << point_transform; | |
1174 }else{ | |
1175 pred= ptr[-1]; | |
1176 } | |
1177 }else{ | |
1178 if(x==0 && mb_x==0){ | |
1179 pred= ptr[-linesize]; | |
1180 }else{ | |
1310 | 1181 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); |
1307 | 1182 } |
1183 } | |
1184 | |
1185 if (s->interlaced && s->bottom_field) | |
1186 ptr += linesize >> 1; | |
1187 *ptr= pred + (mjpeg_decode_dc(s, dc_index[i]) << point_transform); | |
1188 | |
1189 if (++x == h) { | |
1190 x = 0; | |
1191 y++; | |
1192 } | |
1193 } | |
1194 } | |
1195 }else{ | |
1196 for(i=0;i<nb_components;i++) { | |
1197 uint8_t *ptr; | |
1198 int x, y, c, linesize; | |
1199 n = nb_blocks[i]; | |
1200 c = comp_index[i]; | |
1201 h = h_count[i]; | |
1202 v = v_count[i]; | |
1203 x = 0; | |
1204 y = 0; | |
1205 linesize= s->linesize[c]; | |
1206 | |
1207 for(j=0; j<n; j++) { | |
1208 int pred; | |
1209 | |
1210 ptr = s->current_picture[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap | |
1310 | 1211 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); |
1307 | 1212 *ptr= pred + (mjpeg_decode_dc(s, dc_index[i]) << point_transform); |
1213 if (++x == h) { | |
1214 x = 0; | |
1215 y++; | |
1216 } | |
1217 } | |
1218 } | |
1219 } | |
1310 | 1220 if (s->restart_interval && !--s->restart_count) { |
1307 | 1221 align_get_bits(&s->gb); |
1222 skip_bits(&s->gb, 16); /* skip RSTn */ | |
1223 } | |
1224 } | |
1225 } | |
1226 } | |
1227 }else{ | |
1228 for(mb_y = 0; mb_y < mb_height; mb_y++) { | |
23 | 1229 for(mb_x = 0; mb_x < mb_width; mb_x++) { |
1307 | 1230 if (s->restart_interval && !s->restart_count) |
1231 s->restart_count = s->restart_interval; | |
1232 | |
23 | 1233 for(i=0;i<nb_components;i++) { |
1064 | 1234 uint8_t *ptr; |
23 | 1235 int x, y, c; |
1236 n = nb_blocks[i]; | |
1237 c = comp_index[i]; | |
1238 h = h_count[i]; | |
1239 v = v_count[i]; | |
1240 x = 0; | |
1241 y = 0; | |
1242 for(j=0;j<n;j++) { | |
1243 memset(s->block, 0, sizeof(s->block)); | |
1244 if (decode_block(s, s->block, i, | |
1245 dc_index[i], ac_index[i], | |
1246 s->quant_index[c]) < 0) { | |
427 | 1247 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
|
1248 ret = -1; |
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1249 goto the_end; |
23 | 1250 } |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1251 // dprintf("mb: %d %d processed\n", mb_y, mb_x); |
23 | 1252 ptr = s->current_picture[c] + |
1253 (s->linesize[c] * (v * mb_y + y) * 8) + | |
1254 (h * mb_x + x) * 8; | |
53 | 1255 if (s->interlaced && s->bottom_field) |
1256 ptr += s->linesize[c] >> 1; | |
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
1257 s->idct_put(ptr, s->linesize[c], s->block); |
23 | 1258 if (++x == h) { |
1259 x = 0; | |
1260 y++; | |
1261 } | |
1262 } | |
1263 } | |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1264 /* (< 1350) buggy workaround for Spectralfan.mov, should be fixed */ |
881 | 1265 if (s->restart_interval && (s->restart_interval < 1350) && |
1266 !--s->restart_count) { | |
584
03e395b31197
handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents:
541
diff
changeset
|
1267 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
|
1268 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
|
1269 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
|
1270 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
|
1271 } |
23 | 1272 } |
1273 } | |
1307 | 1274 } |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1275 ret = 0; |
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1276 the_end: |
44
92d51f683931
added forgotten emms() - fix various segmentation faults when using mjpeg
glantau
parents:
37
diff
changeset
|
1277 emms_c(); |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1278 return ret; |
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1279 out_of_range: |
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1280 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
|
1281 return -1; |
23 | 1282 } |
1283 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1284 static int mjpeg_decode_dri(MJpegDecodeContext *s) |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1285 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1286 if (get_bits(&s->gb, 16) != 4) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1287 return -1; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1288 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
|
1289 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
|
1290 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1291 return 0; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1292 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1293 |
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
|
1294 static int mjpeg_decode_app(MJpegDecodeContext *s) |
354 | 1295 { |
1296 int len, id; | |
1297 | |
1298 /* XXX: verify len field validity */ | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1299 len = get_bits(&s->gb, 16); |
354 | 1300 if (len < 5) |
1301 return -1; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1302 |
811 | 1303 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
1304 id = be2me_32(id); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1305 len -= 6; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1306 |
1310 | 1307 if(s->avctx->debug & FF_DEBUG_STARTCODE){ |
1308 printf("APPx %8X\n", id); | |
1309 } | |
1310 | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1311 /* 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
|
1312 /* 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
|
1313 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
|
1314 if (id == ff_get_fourcc("AVI1")) |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1315 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1316 /* structure: |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1317 4bytes AVI1 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1318 1bytes polarity |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1319 1bytes always zero |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1320 4bytes field_size |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1321 4bytes field_size_less_padding |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1322 */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1323 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
|
1324 // 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
|
1325 // 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
|
1326 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
|
1327 #if 0 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1328 skip_bits(&s->gb, 8); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1329 skip_bits(&s->gb, 32); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1330 skip_bits(&s->gb, 32); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1331 len -= 10; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1332 #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
|
1333 // 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
|
1334 // 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
|
1335 goto out; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1336 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1337 |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1338 // len -= 2; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1339 |
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
|
1340 if (id == ff_get_fourcc("JFIF")) |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1341 { |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1342 int t_w, t_h; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1343 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
|
1344 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
|
1345 get_bits(&s->gb, 8), get_bits(&s->gb, 8)); |
672 | 1346 if (get_bits(&s->gb, 8) == 0) |
1347 { | |
949 | 1348 int x_density, y_density; |
1349 x_density = get_bits(&s->gb, 16); | |
1350 y_density = get_bits(&s->gb, 16); | |
903 | 1351 |
935 | 1352 dprintf("x/y density: %d (%f), %d (%f)\n", x_density, |
1353 (float)x_density, y_density, (float)y_density); | |
1354 #if 0 | |
903 | 1355 //MN: needs to be checked |
916
259f3efebef5
fixing aspect (hopefully, i couldnt reproduce the bug)
michaelni
parents:
903
diff
changeset
|
1356 if(x_density) |
935 | 1357 // s->avctx->aspect_ratio= s->width*y_density/((float)s->height*x_density); |
1358 s->avctx->aspect_ratio = (float)x_density/y_density; | |
1359 /* 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
|
1360 else |
259f3efebef5
fixing aspect (hopefully, i couldnt reproduce the bug)
michaelni
parents:
903
diff
changeset
|
1361 s->avctx->aspect_ratio= 0.0; |
935 | 1362 #endif |
672 | 1363 } |
1364 else | |
1365 { | |
1366 skip_bits(&s->gb, 16); | |
1367 skip_bits(&s->gb, 16); | |
1368 } | |
935 | 1369 |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1370 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
|
1371 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
|
1372 if (t_w && t_h) |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1373 { |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1374 /* skip thumbnail */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1375 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
|
1376 len -= t_w*t_h*3; |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1377 } |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1378 len -= 10; |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1379 goto out; |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1380 } |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1381 |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1382 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
|
1383 { |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1384 printf("mjpeg: Adobe header found\n"); |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1385 skip_bits(&s->gb, 16); /* version */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1386 skip_bits(&s->gb, 16); /* flags0 */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1387 skip_bits(&s->gb, 16); /* flags1 */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1388 skip_bits(&s->gb, 8); /* transform */ |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1389 len -= 7; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1390 goto out; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1391 } |
1310 | 1392 |
1393 if (id == ff_get_fourcc("LJIF")){ | |
1394 printf("Pegasus lossless jpeg header found\n"); | |
1395 skip_bits(&s->gb, 16); /* version ? */ | |
1396 skip_bits(&s->gb, 16); /* unknwon always 0? */ | |
1397 skip_bits(&s->gb, 16); /* unknwon always 0? */ | |
1398 skip_bits(&s->gb, 16); /* unknwon always 0? */ | |
1399 switch( get_bits(&s->gb, 8)){ | |
1400 case 1: | |
1401 s->rgb= 1; | |
1402 s->rct=0; | |
1403 break; | |
1404 case 2: | |
1405 s->rgb= 1; | |
1406 s->rct=1; | |
1407 break; | |
1408 default: | |
1409 printf("unknown colorspace\n"); | |
1410 } | |
1411 len -= 9; | |
1412 goto out; | |
1413 } | |
354 | 1414 |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1415 /* 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
|
1416 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
|
1417 { |
811 | 1418 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
1419 id = be2me_32(id); | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1420 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
|
1421 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
|
1422 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1423 #if 0 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1424 skip_bits(&s->gb, 32); /* field size */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1425 skip_bits(&s->gb, 32); /* pad field size */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1426 skip_bits(&s->gb, 32); /* next off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1427 skip_bits(&s->gb, 32); /* quant off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1428 skip_bits(&s->gb, 32); /* huff off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1429 skip_bits(&s->gb, 32); /* image off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1430 skip_bits(&s->gb, 32); /* scan off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1431 skip_bits(&s->gb, 32); /* data off */ |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1432 #endif |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1433 if (s->first_picture) |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1434 printf("mjpeg: Apple MJPEG-A header found\n"); |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1435 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1436 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1437 |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1438 out: |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1439 /* 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
|
1440 if (len < 0) |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1441 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
|
1442 while(--len > 0) |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1443 skip_bits(&s->gb, 8); |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1444 |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1445 return 0; |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1446 } |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1447 |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1448 static int mjpeg_decode_com(MJpegDecodeContext *s) |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1449 { |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1450 /* XXX: verify len field validity */ |
1061 | 1451 unsigned int len = get_bits(&s->gb, 16); |
1452 if (len >= 2 && len < 32768) { | |
1453 /* XXX: any better upper bound */ | |
1064 | 1454 uint8_t *cbuf = av_malloc(len - 1); |
1061 | 1455 if (cbuf) { |
1456 int i; | |
1457 for (i = 0; i < len - 2; i++) | |
1458 cbuf[i] = get_bits(&s->gb, 8); | |
1459 if (i > 0 && cbuf[i-1] == '\n') | |
1460 cbuf[i-1] = 0; | |
1461 else | |
1462 cbuf[i] = 0; | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1463 |
1061 | 1464 printf("mjpeg comment: '%s'\n", cbuf); |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1465 |
1061 | 1466 /* buggy avid, it puts EOI only at every 10th frame */ |
1467 if (!strcmp(cbuf, "AVID")) | |
1468 { | |
1469 s->buggy_avid = 1; | |
1470 // if (s->first_picture) | |
1471 // printf("mjpeg: workarounding buggy AVID\n"); | |
1472 } | |
1473 | |
1474 av_free(cbuf); | |
1475 } | |
354 | 1476 } |
1477 | |
1478 return 0; | |
1479 } | |
1480 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1481 #if 0 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1482 static int valid_marker_list[] = |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1483 { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1484 /* 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
|
1485 /* 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
|
1486 /* 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
|
1487 /* 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
|
1488 /* 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
|
1489 /* 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
|
1490 /* 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
|
1491 /* 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
|
1492 /* 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
|
1493 /* 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
|
1494 /* 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
|
1495 /* 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
|
1496 /* 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
|
1497 /* 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
|
1498 /* 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
|
1499 /* 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
|
1500 /* 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
|
1501 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1502 #endif |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1503 |
23 | 1504 /* return the 8 bit start code value and update the search |
1505 state. Return -1 if no start code found */ | |
1064 | 1506 static int find_marker(uint8_t **pbuf_ptr, uint8_t *buf_end) |
23 | 1507 { |
1064 | 1508 uint8_t *buf_ptr; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1509 unsigned int v, v2; |
23 | 1510 int val; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1511 #ifdef DEBUG |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1512 int skipped=0; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1513 #endif |
23 | 1514 |
1515 buf_ptr = *pbuf_ptr; | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1516 while (buf_ptr < buf_end) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1517 v = *buf_ptr++; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1518 v2 = *buf_ptr; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1519 if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe)) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1520 val = *buf_ptr++; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1521 goto found; |
23 | 1522 } |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1523 #ifdef DEBUG |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1524 skipped++; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1525 #endif |
23 | 1526 } |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1527 val = -1; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1528 found: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1529 #ifdef DEBUG |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1530 dprintf("find_marker skipped %d bytes\n", skipped); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1531 #endif |
23 | 1532 *pbuf_ptr = buf_ptr; |
1533 return val; | |
1534 } | |
1535 | |
1536 static int mjpeg_decode_frame(AVCodecContext *avctx, | |
1537 void *data, int *data_size, | |
1064 | 1538 uint8_t *buf, int buf_size) |
23 | 1539 { |
1540 MJpegDecodeContext *s = avctx->priv_data; | |
1064 | 1541 uint8_t *buf_end, *buf_ptr; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1542 int i, start_code; |
23 | 1543 AVPicture *picture = data; |
1544 | |
68 | 1545 *data_size = 0; |
1546 | |
23 | 1547 /* no supplementary picture */ |
68 | 1548 if (buf_size == 0) |
23 | 1549 return 0; |
1550 | |
1551 buf_ptr = buf; | |
1552 buf_end = buf + buf_size; | |
1553 while (buf_ptr < buf_end) { | |
1554 /* find start next marker */ | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1555 start_code = find_marker(&buf_ptr, buf_end); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1556 { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1557 /* EOF */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1558 if (start_code < 0) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1559 goto the_end; |
354 | 1560 } else { |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1561 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
|
1562 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1563 if ((buf_end - buf_ptr) > s->buffer_size) |
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 av_free(s->buffer); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1566 s->buffer_size = buf_end-buf_ptr; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1567 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
|
1568 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
|
1569 s->buffer_size); |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1570 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1571 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1572 /* unescape buffer of SOS */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1573 if (start_code == SOS) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1574 { |
1064 | 1575 uint8_t *src = buf_ptr; |
1576 uint8_t *dst = s->buffer; | |
775
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 while (src<buf_end) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1579 { |
1064 | 1580 uint8_t x = *(src++); |
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1581 |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1582 *(dst++) = x; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1583 if (x == 0xff) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1584 { |
840 | 1585 while(*src == 0xff) src++; |
1586 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1587 x = *(src++); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1588 if (x >= 0xd0 && x <= 0xd7) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1589 *(dst++) = x; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1590 else if (x) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1591 break; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1592 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1593 } |
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
|
1594 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
|
1595 |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1596 dprintf("escaping removed %d bytes\n", |
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1597 (buf_end - buf_ptr) - (dst - s->buffer)); |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1598 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1599 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
|
1600 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
|
1601 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1602 s->start_code = start_code; |
1310 | 1603 if(s->avctx->debug & FF_DEBUG_STARTCODE){ |
1604 printf("startcode: %X\n", start_code); | |
1605 } | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1606 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1607 /* process markers */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1608 if (start_code >= 0xd0 && start_code <= 0xd7) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1609 dprintf("restart marker: %d\n", start_code&0x0f); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1610 } else if (s->first_picture) { |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1611 /* APP fields */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1612 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
|
1613 mjpeg_decode_app(s); |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1614 /* Comment */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1615 else if (start_code == COM) |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1616 mjpeg_decode_com(s); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1617 } |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1618 |
23 | 1619 switch(start_code) { |
1620 case SOI: | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1621 s->restart_interval = 0; |
23 | 1622 /* nothing to do on SOI */ |
1623 break; | |
1624 case DQT: | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1625 mjpeg_decode_dqt(s); |
23 | 1626 break; |
1627 case DHT: | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1628 mjpeg_decode_dht(s); |
23 | 1629 break; |
1630 case SOF0: | |
1307 | 1631 s->lossless=0; |
1632 if (mjpeg_decode_sof(s) < 0) | |
1633 return -1; | |
1634 break; | |
1635 case SOF3: | |
1636 s->lossless=1; | |
1637 if (mjpeg_decode_sof(s) < 0) | |
901 | 1638 return -1; |
23 | 1639 break; |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1640 case EOI: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1641 eoi_parser: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1642 { |
53 | 1643 if (s->interlaced) { |
1644 s->bottom_field ^= 1; | |
1645 /* if not bottom field, do not output image yet */ | |
1646 if (s->bottom_field) | |
540
4cee7ce37e10
don't exit decoder after decoding first field -> fixes angels.avi interlacing
arpi_esp
parents:
527
diff
changeset
|
1647 goto not_the_end; |
53 | 1648 } |
23 | 1649 for(i=0;i<3;i++) { |
1650 picture->data[i] = s->current_picture[i]; | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1651 picture->linesize[i] = (s->interlaced) ? |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1652 s->linesize[i] >> 1 : s->linesize[i]; |
23 | 1653 } |
1654 *data_size = sizeof(AVPicture); | |
1655 avctx->height = s->height; | |
53 | 1656 if (s->interlaced) |
1657 avctx->height *= 2; | |
23 | 1658 avctx->width = s->width; |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1659 /* XXX: not complete test ! */ |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1660 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
|
1661 case 0x11: |
1307 | 1662 if(s->rgb){ |
1310 | 1663 #ifdef WORDS_BIGENDIAN |
1664 avctx->pix_fmt = PIX_FMT_ABGR32; | |
1665 #else | |
1307 | 1666 avctx->pix_fmt = PIX_FMT_RGBA32; |
1310 | 1667 #endif |
1307 | 1668 }else |
1669 avctx->pix_fmt = PIX_FMT_YUV444P; | |
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1670 break; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1671 case 0x21: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1672 avctx->pix_fmt = PIX_FMT_YUV422P; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1673 break; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1674 default: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1675 case 0x22: |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1676 avctx->pix_fmt = PIX_FMT_YUV420P; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1677 break; |
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1678 } |
47
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1679 /* dummy quality */ |
bd0dd8d0b759
return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents:
44
diff
changeset
|
1680 /* XXX: infer it with matrix */ |
903 | 1681 // avctx->quality = 3; |
23 | 1682 goto the_end; |
1683 } | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1684 break; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1685 case SOS: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1686 mjpeg_decode_sos(s); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1687 /* buggy avid puts EOI every 10-20th frame */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1688 /* if restart period is over process EOI */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1689 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
|
1690 goto eoi_parser; |
23 | 1691 break; |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1692 case DRI: |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1693 mjpeg_decode_dri(s); |
354 | 1694 break; |
1695 case SOF1: | |
1696 case SOF2: | |
1697 case SOF5: | |
1698 case SOF6: | |
1699 case SOF7: | |
1700 case SOF9: | |
1701 case SOF10: | |
1702 case SOF11: | |
1703 case SOF13: | |
1704 case SOF14: | |
1705 case SOF15: | |
1706 case JPG: | |
1707 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
|
1708 break; |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1709 // default: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1710 // printf("mjpeg: unsupported marker (%x)\n", start_code); |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1711 // break; |
23 | 1712 } |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1713 |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1714 not_the_end: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1715 /* eof process start code */ |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1716 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
|
1717 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
|
1718 (get_bits_count(&s->gb)+7)/8, get_bits_count(&s->gb)); |
23 | 1719 } |
1720 } | |
1721 } | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1722 the_end: |
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1723 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
|
1724 // return buf_end - buf_ptr; |
23 | 1725 return buf_ptr - buf; |
1726 } | |
1727 | |
881 | 1728 static int mjpegb_decode_frame(AVCodecContext *avctx, |
1729 void *data, int *data_size, | |
1064 | 1730 uint8_t *buf, int buf_size) |
881 | 1731 { |
1732 MJpegDecodeContext *s = avctx->priv_data; | |
1064 | 1733 uint8_t *buf_end, *buf_ptr; |
881 | 1734 int i; |
1735 AVPicture *picture = data; | |
1736 GetBitContext hgb; /* for the header */ | |
1737 uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs; | |
1738 uint32_t field_size; | |
1739 | |
1740 *data_size = 0; | |
1741 | |
1742 /* no supplementary picture */ | |
1743 if (buf_size == 0) | |
1744 return 0; | |
1745 | |
1746 buf_ptr = buf; | |
1747 buf_end = buf + buf_size; | |
1748 | |
1749 read_header: | |
1750 /* reset on every SOI */ | |
1751 s->restart_interval = 0; | |
1752 | |
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
|
1753 init_get_bits(&hgb, buf_ptr, /*buf_size*/(buf_end - buf_ptr)*8); |
881 | 1754 |
1755 skip_bits(&hgb, 32); /* reserved zeros */ | |
1756 | |
1757 if (get_bits(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg"))) | |
1758 { | |
1759 dprintf("not mjpeg-b (bad fourcc)\n"); | |
1760 return 0; | |
1761 } | |
1762 | |
1763 field_size = get_bits(&hgb, 32); /* field size */ | |
1764 dprintf("field size: 0x%x\n", field_size); | |
1765 skip_bits(&hgb, 32); /* padded field size */ | |
1766 second_field_offs = get_bits(&hgb, 32); | |
1767 dprintf("second field offs: 0x%x\n", second_field_offs); | |
1768 if (second_field_offs) | |
1769 s->interlaced = 1; | |
1770 | |
1771 dqt_offs = get_bits(&hgb, 32); | |
1772 dprintf("dqt offs: 0x%x\n", dqt_offs); | |
1773 if (dqt_offs) | |
1774 { | |
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
|
1775 init_get_bits(&s->gb, buf+dqt_offs, (buf_end - (buf+dqt_offs))*8); |
881 | 1776 s->start_code = DQT; |
1777 mjpeg_decode_dqt(s); | |
1778 } | |
1779 | |
1780 dht_offs = get_bits(&hgb, 32); | |
1781 dprintf("dht offs: 0x%x\n", dht_offs); | |
1782 if (dht_offs) | |
1783 { | |
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
|
1784 init_get_bits(&s->gb, buf+dht_offs, (buf_end - (buf+dht_offs))*8); |
881 | 1785 s->start_code = DHT; |
1786 mjpeg_decode_dht(s); | |
1787 } | |
1788 | |
1789 sof_offs = get_bits(&hgb, 32); | |
1790 dprintf("sof offs: 0x%x\n", sof_offs); | |
1791 if (sof_offs) | |
1792 { | |
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
|
1793 init_get_bits(&s->gb, buf+sof_offs, (buf_end - (buf+sof_offs))*8); |
881 | 1794 s->start_code = SOF0; |
1307 | 1795 if (mjpeg_decode_sof(s) < 0) |
901 | 1796 return -1; |
881 | 1797 } |
1798 | |
1799 sos_offs = get_bits(&hgb, 32); | |
1800 dprintf("sos offs: 0x%x\n", sos_offs); | |
1801 if (sos_offs) | |
1802 { | |
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
|
1803 // 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
|
1804 init_get_bits(&s->gb, buf+sos_offs, field_size*8); |
881 | 1805 s->start_code = SOS; |
1806 mjpeg_decode_sos(s); | |
1807 } | |
1808 | |
1809 skip_bits(&hgb, 32); /* start of data offset */ | |
1810 | |
1811 if (s->interlaced) { | |
1812 s->bottom_field ^= 1; | |
1813 /* if not bottom field, do not output image yet */ | |
1814 if (s->bottom_field && second_field_offs) | |
1815 { | |
1816 buf_ptr = buf + second_field_offs; | |
1817 second_field_offs = 0; | |
1818 goto read_header; | |
1819 } | |
1820 } | |
1821 | |
1822 for(i=0;i<3;i++) { | |
1823 picture->data[i] = s->current_picture[i]; | |
1824 picture->linesize[i] = (s->interlaced) ? | |
1825 s->linesize[i] >> 1 : s->linesize[i]; | |
1826 } | |
1827 *data_size = sizeof(AVPicture); | |
1828 avctx->height = s->height; | |
1829 if (s->interlaced) | |
1830 avctx->height *= 2; | |
1831 avctx->width = s->width; | |
1832 /* XXX: not complete test ! */ | |
1833 switch((s->h_count[0] << 4) | s->v_count[0]) { | |
1834 case 0x11: | |
1835 avctx->pix_fmt = PIX_FMT_YUV444P; | |
1836 break; | |
1837 case 0x21: | |
1838 avctx->pix_fmt = PIX_FMT_YUV422P; | |
1839 break; | |
1840 default: | |
1841 case 0x22: | |
1842 avctx->pix_fmt = PIX_FMT_YUV420P; | |
1843 break; | |
1844 } | |
1845 /* dummy quality */ | |
1846 /* XXX: infer it with matrix */ | |
903 | 1847 // avctx->quality = 3; |
881 | 1848 |
1849 return buf_ptr - buf; | |
1850 } | |
1851 | |
1852 | |
23 | 1853 static int mjpeg_decode_end(AVCodecContext *avctx) |
1854 { | |
1855 MJpegDecodeContext *s = avctx->priv_data; | |
1856 int i, j; | |
1857 | |
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1858 av_free(s->buffer); |
23 | 1859 for(i=0;i<MAX_COMPONENTS;i++) |
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
1860 av_free(s->current_picture[i]); |
23 | 1861 for(i=0;i<2;i++) { |
1862 for(j=0;j<4;j++) | |
1863 free_vlc(&s->vlcs[i][j]); | |
1864 } | |
1865 return 0; | |
1866 } | |
1867 | |
1868 AVCodec mjpeg_decoder = { | |
1869 "mjpeg", | |
1870 CODEC_TYPE_VIDEO, | |
1871 CODEC_ID_MJPEG, | |
1872 sizeof(MJpegDecodeContext), | |
1873 mjpeg_decode_init, | |
1874 NULL, | |
1875 mjpeg_decode_end, | |
1876 mjpeg_decode_frame, | |
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1877 0, |
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1878 NULL |
23 | 1879 }; |
881 | 1880 |
1881 AVCodec mjpegb_decoder = { | |
1882 "mjpegb", | |
1883 CODEC_TYPE_VIDEO, | |
1884 CODEC_ID_MJPEGB, | |
1885 sizeof(MJpegDecodeContext), | |
1886 mjpeg_decode_init, | |
1887 NULL, | |
1888 mjpeg_decode_end, | |
1889 mjpegb_decode_frame, | |
1890 0, | |
1891 NULL | |
1892 }; |