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