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