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