Mercurial > libavcodec.hg
annotate mjpeg.c @ 3062:8d05d4036b6a libavcodec
Mjpeg interlaced decoding fix, height was wrong while decoding (/2).
Patch by Baptiste Coudurier, baptiste _ coudurier at smartjog _ com.
| author | banan |
|---|---|
| date | Mon, 23 Jan 2006 06:40:08 +0000 |
| parents | 0b546eab515d |
| children | 1e63c12c2c71 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 23 | 2 * MJPEG encoder and decoder |
| 427 | 3 * Copyright (c) 2000, 2001 Fabrice Bellard. |
| 2181 | 4 * Copyright (c) 2003 Alex Beregszaszi |
| 5 * Copyright (c) 2003-2004 Michael Niedermayer | |
| 0 | 6 * |
| 427 | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Lesser General Public | |
| 9 * License as published by the Free Software Foundation; either | |
| 10 * version 2 of the License, or (at your option) any later version. | |
| 0 | 11 * |
| 427 | 12 * This library is distributed in the hope that it will be useful, |
| 0 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 427 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Lesser General Public License for more details. | |
| 0 | 16 * |
| 427 | 17 * You should have received a copy of the GNU Lesser General Public |
| 18 * License along with this library; if not, write to the Free Software | |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2979
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
20 * |
| 672 | 21 * Support for external huffman table, various fixes (AVID workaround), |
| 881 | 22 * aspecting, new decode_frame mechanism and apple mjpeg-b support |
| 672 | 23 * by Alex Beregszaszi <alex@naxine.org> |
| 0 | 24 */ |
| 1106 | 25 |
| 26 /** | |
| 27 * @file mjpeg.c | |
| 28 * MJPEG encoder and decoder. | |
| 29 */ | |
| 2967 | 30 |
| 776 | 31 //#define DEBUG |
| 1307 | 32 #include <assert.h> |
| 33 | |
| 0 | 34 #include "avcodec.h" |
| 35 #include "dsputil.h" | |
| 36 #include "mpegvideo.h" | |
| 37 | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
38 /* 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
|
39 /* not yet working */ |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
40 #undef TWOMATRIXES |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
41 |
| 0 | 42 typedef struct MJpegContext { |
| 2967 | 43 uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chrom, for easier addressing |
| 1064 | 44 uint16_t huff_code_dc_luminance[12]; |
| 45 uint8_t huff_size_dc_chrominance[12]; | |
| 46 uint16_t huff_code_dc_chrominance[12]; | |
| 0 | 47 |
| 1064 | 48 uint8_t huff_size_ac_luminance[256]; |
| 49 uint16_t huff_code_ac_luminance[256]; | |
| 50 uint8_t huff_size_ac_chrominance[256]; | |
| 51 uint16_t huff_code_ac_chrominance[256]; | |
| 0 | 52 } MJpegContext; |
| 53 | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
54 /* JPEG marker codes */ |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
55 typedef enum { |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
56 /* start of frame */ |
| 2979 | 57 SOF0 = 0xc0, /* baseline */ |
| 58 SOF1 = 0xc1, /* extended sequential, huffman */ | |
| 59 SOF2 = 0xc2, /* progressive, huffman */ | |
| 60 SOF3 = 0xc3, /* lossless, huffman */ | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
61 |
| 2979 | 62 SOF5 = 0xc5, /* differential sequential, huffman */ |
| 63 SOF6 = 0xc6, /* differential progressive, huffman */ | |
| 64 SOF7 = 0xc7, /* differential lossless, huffman */ | |
| 65 JPG = 0xc8, /* reserved for JPEG extension */ | |
| 66 SOF9 = 0xc9, /* extended sequential, arithmetic */ | |
| 67 SOF10 = 0xca, /* progressive, arithmetic */ | |
| 68 SOF11 = 0xcb, /* lossless, arithmetic */ | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
69 |
| 2979 | 70 SOF13 = 0xcd, /* differential sequential, arithmetic */ |
| 71 SOF14 = 0xce, /* differential progressive, arithmetic */ | |
| 72 SOF15 = 0xcf, /* differential lossless, arithmetic */ | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
73 |
| 2979 | 74 DHT = 0xc4, /* define huffman tables */ |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
75 |
| 2979 | 76 DAC = 0xcc, /* define arithmetic-coding conditioning */ |
|
349
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 /* 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
|
79 RST0 = 0xd0, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
80 RST1 = 0xd1, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
81 RST2 = 0xd2, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
82 RST3 = 0xd3, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
83 RST4 = 0xd4, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
84 RST5 = 0xd5, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
85 RST6 = 0xd6, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
86 RST7 = 0xd7, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
87 |
| 2979 | 88 SOI = 0xd8, /* start of image */ |
| 89 EOI = 0xd9, /* end of image */ | |
| 90 SOS = 0xda, /* start of scan */ | |
| 91 DQT = 0xdb, /* define quantization tables */ | |
| 92 DNL = 0xdc, /* define number of lines */ | |
| 93 DRI = 0xdd, /* define restart interval */ | |
| 94 DHP = 0xde, /* define hierarchical progression */ | |
| 95 EXP = 0xdf, /* expand reference components */ | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
96 |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
97 APP0 = 0xe0, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
98 APP1 = 0xe1, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
99 APP2 = 0xe2, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
100 APP3 = 0xe3, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
101 APP4 = 0xe4, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
102 APP5 = 0xe5, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
103 APP6 = 0xe6, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
104 APP7 = 0xe7, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
105 APP8 = 0xe8, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
106 APP9 = 0xe9, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
107 APP10 = 0xea, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
108 APP11 = 0xeb, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
109 APP12 = 0xec, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
110 APP13 = 0xed, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
111 APP14 = 0xee, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
112 APP15 = 0xef, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
113 |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
114 JPG0 = 0xf0, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
115 JPG1 = 0xf1, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
116 JPG2 = 0xf2, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
117 JPG3 = 0xf3, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
118 JPG4 = 0xf4, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
119 JPG5 = 0xf5, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
120 JPG6 = 0xf6, |
| 2979 | 121 SOF48 = 0xf7, ///< JPEG-LS |
| 122 LSE = 0xf8, ///< JPEG-LS extension parameters | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
123 JPG9 = 0xf9, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
124 JPG10 = 0xfa, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
125 JPG11 = 0xfb, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
126 JPG12 = 0xfc, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
127 JPG13 = 0xfd, |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
128 |
| 2979 | 129 COM = 0xfe, /* comment */ |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
130 |
| 2979 | 131 TEM = 0x01, /* temporary private use for arithmetic coding */ |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
132 |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
133 /* 0x02 -> 0xbf reserved */ |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
134 } JPEG_MARKER; |
| 0 | 135 |
| 136 #if 0 | |
| 137 /* These are the sample quantization tables given in JPEG spec section K.1. | |
| 138 * The spec says that the values given produce "good" quality, and | |
| 139 * when divided by 2, "very good" quality. | |
| 140 */ | |
| 141 static const unsigned char std_luminance_quant_tbl[64] = { | |
| 142 16, 11, 10, 16, 24, 40, 51, 61, | |
| 143 12, 12, 14, 19, 26, 58, 60, 55, | |
| 144 14, 13, 16, 24, 40, 57, 69, 56, | |
| 145 14, 17, 22, 29, 51, 87, 80, 62, | |
| 146 18, 22, 37, 56, 68, 109, 103, 77, | |
| 147 24, 35, 55, 64, 81, 104, 113, 92, | |
| 148 49, 64, 78, 87, 103, 121, 120, 101, | |
| 149 72, 92, 95, 98, 112, 100, 103, 99 | |
| 150 }; | |
| 151 static const unsigned char std_chrominance_quant_tbl[64] = { | |
| 152 17, 18, 24, 47, 99, 99, 99, 99, | |
| 153 18, 21, 26, 66, 99, 99, 99, 99, | |
| 154 24, 26, 56, 99, 99, 99, 99, 99, | |
| 155 47, 66, 99, 99, 99, 99, 99, 99, | |
| 156 99, 99, 99, 99, 99, 99, 99, 99, | |
| 157 99, 99, 99, 99, 99, 99, 99, 99, | |
| 158 99, 99, 99, 99, 99, 99, 99, 99, | |
| 159 99, 99, 99, 99, 99, 99, 99, 99 | |
| 160 }; | |
| 161 #endif | |
| 162 | |
| 163 /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ | |
| 164 /* IMPORTANT: these are only valid for 8-bit data precision! */ | |
| 1064 | 165 static const uint8_t bits_dc_luminance[17] = |
| 0 | 166 { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; |
| 1064 | 167 static const uint8_t val_dc_luminance[] = |
| 0 | 168 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; |
| 169 | |
| 1064 | 170 static const uint8_t bits_dc_chrominance[17] = |
| 0 | 171 { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; |
| 1064 | 172 static const uint8_t val_dc_chrominance[] = |
| 0 | 173 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; |
| 174 | |
| 1064 | 175 static const uint8_t bits_ac_luminance[17] = |
| 0 | 176 { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; |
| 1064 | 177 static const uint8_t val_ac_luminance[] = |
| 0 | 178 { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, |
| 179 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, | |
| 180 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, | |
| 181 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, | |
| 182 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, | |
| 183 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, | |
| 184 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, | |
| 185 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, | |
| 186 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, | |
| 187 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, | |
| 188 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, | |
| 189 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, | |
| 190 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, | |
| 191 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, | |
| 192 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, | |
| 193 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, | |
| 194 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, | |
| 195 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, | |
| 196 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, | |
| 197 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, | |
| 2967 | 198 0xf9, 0xfa |
| 0 | 199 }; |
| 200 | |
| 1064 | 201 static const uint8_t bits_ac_chrominance[17] = |
| 0 | 202 { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; |
| 203 | |
| 1064 | 204 static const uint8_t val_ac_chrominance[] = |
| 0 | 205 { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, |
| 206 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, | |
| 207 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, | |
| 208 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, | |
| 209 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, | |
| 210 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, | |
| 211 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, | |
| 212 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, | |
| 213 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, | |
| 214 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, | |
| 215 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, | |
| 216 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, | |
| 217 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, | |
| 218 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, | |
| 219 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, | |
| 220 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, | |
| 221 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, | |
| 222 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, | |
| 223 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, | |
| 224 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, | |
| 2967 | 225 0xf9, 0xfa |
| 0 | 226 }; |
| 227 | |
| 228 /* isn't this function nicer than the one in the libjpeg ? */ | |
| 1064 | 229 static void build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, |
| 230 const uint8_t *bits_table, const uint8_t *val_table) | |
| 0 | 231 { |
| 232 int i, j, k,nb, code, sym; | |
| 233 | |
| 234 code = 0; | |
| 235 k = 0; | |
| 236 for(i=1;i<=16;i++) { | |
| 237 nb = bits_table[i]; | |
| 238 for(j=0;j<nb;j++) { | |
| 239 sym = val_table[k++]; | |
| 240 huff_size[sym] = i; | |
| 241 huff_code[sym] = code; | |
| 242 code++; | |
| 243 } | |
| 244 code <<= 1; | |
| 245 } | |
| 246 } | |
| 247 | |
|
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1522
diff
changeset
|
248 #ifdef CONFIG_ENCODERS |
| 0 | 249 int mjpeg_init(MpegEncContext *s) |
| 250 { | |
| 251 MJpegContext *m; | |
| 2967 | 252 |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
253 m = av_malloc(sizeof(MJpegContext)); |
| 0 | 254 if (!m) |
| 255 return -1; | |
| 2967 | 256 |
| 344 | 257 s->min_qcoeff=-1023; |
| 258 s->max_qcoeff= 1023; | |
| 0 | 259 |
| 260 /* build all the huffman tables */ | |
| 261 build_huffman_codes(m->huff_size_dc_luminance, | |
| 262 m->huff_code_dc_luminance, | |
| 263 bits_dc_luminance, | |
| 264 val_dc_luminance); | |
| 265 build_huffman_codes(m->huff_size_dc_chrominance, | |
| 266 m->huff_code_dc_chrominance, | |
| 267 bits_dc_chrominance, | |
| 268 val_dc_chrominance); | |
| 269 build_huffman_codes(m->huff_size_ac_luminance, | |
| 270 m->huff_code_ac_luminance, | |
| 271 bits_ac_luminance, | |
| 272 val_ac_luminance); | |
| 273 build_huffman_codes(m->huff_size_ac_chrominance, | |
| 274 m->huff_code_ac_chrominance, | |
| 275 bits_ac_chrominance, | |
| 276 val_ac_chrominance); | |
| 2967 | 277 |
| 0 | 278 s->mjpeg_ctx = m; |
| 279 return 0; | |
| 280 } | |
| 281 | |
| 282 void mjpeg_close(MpegEncContext *s) | |
| 283 { | |
|
396
fce0a2520551
removed useless header includes - use av memory functions
glantau
parents:
375
diff
changeset
|
284 av_free(s->mjpeg_ctx); |
| 0 | 285 } |
|
1530
3b31998fe22f
disable encoders where appropriate (patch courtesy of BERO
melanson
parents:
1522
diff
changeset
|
286 #endif //CONFIG_ENCODERS |
| 0 | 287 |
| 1310 | 288 #define PREDICT(ret, topleft, top, left, predictor)\ |
| 289 switch(predictor){\ | |
| 290 case 1: ret= left; break;\ | |
| 291 case 2: ret= top; break;\ | |
| 292 case 3: ret= topleft; break;\ | |
| 293 case 4: ret= left + top - topleft; break;\ | |
| 294 case 5: ret= left + ((top - topleft)>>1); break;\ | |
| 295 case 6: ret= top + ((left - topleft)>>1); break;\ | |
| 1455 | 296 default:\ |
| 1310 | 297 case 7: ret= (left + top)>>1; break;\ |
| 1307 | 298 } |
| 299 | |
| 1325 | 300 #ifdef CONFIG_ENCODERS |
| 0 | 301 static inline void put_marker(PutBitContext *p, int code) |
| 302 { | |
| 303 put_bits(p, 8, 0xff); | |
| 304 put_bits(p, 8, code); | |
| 305 } | |
| 306 | |
| 307 /* table_class: 0 = DC coef, 1 = AC coefs */ | |
| 308 static int put_huffman_table(MpegEncContext *s, int table_class, int table_id, | |
| 1064 | 309 const uint8_t *bits_table, const uint8_t *value_table) |
| 0 | 310 { |
| 311 PutBitContext *p = &s->pb; | |
| 312 int n, i; | |
| 313 | |
| 314 put_bits(p, 4, table_class); | |
| 315 put_bits(p, 4, table_id); | |
| 316 | |
| 317 n = 0; | |
| 318 for(i=1;i<=16;i++) { | |
| 319 n += bits_table[i]; | |
| 320 put_bits(p, 8, bits_table[i]); | |
| 321 } | |
| 322 | |
| 323 for(i=0;i<n;i++) | |
| 324 put_bits(p, 8, value_table[i]); | |
| 325 | |
| 326 return n + 17; | |
| 327 } | |
| 328 | |
| 329 static void jpeg_table_header(MpegEncContext *s) | |
| 330 { | |
| 331 PutBitContext *p = &s->pb; | |
| 37 | 332 int i, j, size; |
| 1064 | 333 uint8_t *ptr; |
| 0 | 334 |
| 335 /* quant matrixes */ | |
| 336 put_marker(p, DQT); | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
337 #ifdef TWOMATRIXES |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
338 put_bits(p, 16, 2 + 2 * (1 + 64)); |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
339 #else |
| 0 | 340 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
|
341 #endif |
| 0 | 342 put_bits(p, 4, 0); /* 8 bit precision */ |
| 343 put_bits(p, 4, 0); /* table 0 */ | |
| 344 for(i=0;i<64;i++) { | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
345 j = s->intra_scantable.permutated[i]; |
| 37 | 346 put_bits(p, 8, s->intra_matrix[j]); |
| 0 | 347 } |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
348 #ifdef TWOMATRIXES |
| 0 | 349 put_bits(p, 4, 0); /* 8 bit precision */ |
| 350 put_bits(p, 4, 1); /* table 1 */ | |
| 351 for(i=0;i<64;i++) { | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
352 j = s->intra_scantable.permutated[i]; |
| 37 | 353 put_bits(p, 8, s->chroma_intra_matrix[j]); |
| 0 | 354 } |
| 355 #endif | |
| 356 | |
| 357 /* huffman table */ | |
| 358 put_marker(p, DHT); | |
| 359 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
|
360 ptr = pbBufPtr(p); |
| 0 | 361 put_bits(p, 16, 0); /* patched later */ |
| 362 size = 2; | |
| 363 size += put_huffman_table(s, 0, 0, bits_dc_luminance, val_dc_luminance); | |
| 364 size += put_huffman_table(s, 0, 1, bits_dc_chrominance, val_dc_chrominance); | |
| 2967 | 365 |
| 0 | 366 size += put_huffman_table(s, 1, 0, bits_ac_luminance, val_ac_luminance); |
| 367 size += put_huffman_table(s, 1, 1, bits_ac_chrominance, val_ac_chrominance); | |
| 368 ptr[0] = size >> 8; | |
| 369 ptr[1] = size; | |
| 370 } | |
| 371 | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
372 static void jpeg_put_comments(MpegEncContext *s) |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
373 { |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
374 PutBitContext *p = &s->pb; |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
375 int size; |
| 1064 | 376 uint8_t *ptr; |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
377 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
378 if (s->aspect_ratio_info /* && !lossless */) |
| 672 | 379 { |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
380 /* JFIF header */ |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
381 put_marker(p, APP0); |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
382 put_bits(p, 16, 16); |
|
2885
5dfb90019814
Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
diego
parents:
2846
diff
changeset
|
383 ff_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */ |
| 672 | 384 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
|
385 put_bits(p, 8, 0); /* units type: 0 - aspect ratio */ |
| 1548 | 386 put_bits(p, 16, s->avctx->sample_aspect_ratio.num); |
| 387 put_bits(p, 16, s->avctx->sample_aspect_ratio.den); | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
388 put_bits(p, 8, 0); /* thumbnail width */ |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
389 put_bits(p, 8, 0); /* thumbnail height */ |
| 672 | 390 } |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
391 |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
392 /* comment */ |
| 1092 | 393 if(!(s->flags & CODEC_FLAG_BITEXACT)){ |
| 676 | 394 put_marker(p, COM); |
| 395 flush_put_bits(p); | |
| 396 ptr = pbBufPtr(p); | |
| 397 put_bits(p, 16, 0); /* patched later */ | |
|
2885
5dfb90019814
Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
diego
parents:
2846
diff
changeset
|
398 ff_put_string(p, LIBAVCODEC_IDENT, 1); |
| 1118 | 399 size = strlen(LIBAVCODEC_IDENT)+3; |
| 676 | 400 ptr[0] = size >> 8; |
| 401 ptr[1] = size; | |
| 402 } | |
| 2442 | 403 |
| 2967 | 404 if( s->avctx->pix_fmt == PIX_FMT_YUV420P |
| 2442 | 405 ||s->avctx->pix_fmt == PIX_FMT_YUV422P |
| 406 ||s->avctx->pix_fmt == PIX_FMT_YUV444P){ | |
| 407 put_marker(p, COM); | |
| 408 flush_put_bits(p); | |
| 409 ptr = pbBufPtr(p); | |
| 410 put_bits(p, 16, 0); /* patched later */ | |
|
2885
5dfb90019814
Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
diego
parents:
2846
diff
changeset
|
411 ff_put_string(p, "CS=ITU601", 1); |
| 2442 | 412 size = strlen("CS=ITU601")+3; |
| 413 ptr[0] = size >> 8; | |
| 414 ptr[1] = size; | |
| 415 } | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
416 } |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
417 |
| 0 | 418 void mjpeg_picture_header(MpegEncContext *s) |
| 419 { | |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
420 const int lossless= s->avctx->codec_id != CODEC_ID_MJPEG; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
421 const int ls = s->avctx->codec_id == CODEC_ID_JPEGLS; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
422 |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
423 assert(!(ls && s->mjpeg_write_tables)); |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
424 |
| 0 | 425 put_marker(&s->pb, SOI); |
| 426 | |
|
370
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
427 if (!s->mjpeg_data_only_frames) |
|
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
428 { |
| 2967 | 429 jpeg_put_comments(s); |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
430 |
| 229 | 431 if (s->mjpeg_write_tables) jpeg_table_header(s); |
| 0 | 432 |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
433 switch(s->avctx->codec_id){ |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
434 case CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
435 case CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
436 case CODEC_ID_JPEGLS: put_marker(&s->pb, SOF48); break; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
437 default: assert(0); |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
438 } |
| 0 | 439 |
| 440 put_bits(&s->pb, 16, 17); | |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
441 if(lossless && s->avctx->pix_fmt == PIX_FMT_RGBA32) |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
442 put_bits(&s->pb, 8, 9); /* 9 bits/component RCT */ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
443 else |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
444 put_bits(&s->pb, 8, 8); /* 8 bits/component */ |
| 0 | 445 put_bits(&s->pb, 16, s->height); |
| 446 put_bits(&s->pb, 16, s->width); | |
| 447 put_bits(&s->pb, 8, 3); /* 3 components */ | |
| 2967 | 448 |
| 0 | 449 /* Y component */ |
| 450 put_bits(&s->pb, 8, 1); /* component number */ | |
| 229 | 451 put_bits(&s->pb, 4, s->mjpeg_hsample[0]); /* H factor */ |
| 452 put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */ | |
| 0 | 453 put_bits(&s->pb, 8, 0); /* select matrix */ |
| 2967 | 454 |
| 0 | 455 /* Cb component */ |
| 456 put_bits(&s->pb, 8, 2); /* component number */ | |
| 229 | 457 put_bits(&s->pb, 4, s->mjpeg_hsample[1]); /* H factor */ |
| 458 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
|
459 #ifdef TWOMATRIXES |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
460 put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */ |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
461 #else |
| 0 | 462 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
|
463 #endif |
| 0 | 464 |
| 465 /* Cr component */ | |
| 466 put_bits(&s->pb, 8, 3); /* component number */ | |
| 229 | 467 put_bits(&s->pb, 4, s->mjpeg_hsample[2]); /* H factor */ |
| 468 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
|
469 #ifdef TWOMATRIXES |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
470 put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */ |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
471 #else |
| 0 | 472 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
|
473 #endif |
|
370
0eca28d16cbd
clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents:
369
diff
changeset
|
474 } |
| 0 | 475 |
| 476 /* scan header */ | |
| 477 put_marker(&s->pb, SOS); | |
| 478 put_bits(&s->pb, 16, 12); /* length */ | |
| 479 put_bits(&s->pb, 8, 3); /* 3 components */ | |
| 2967 | 480 |
| 0 | 481 /* Y component */ |
| 482 put_bits(&s->pb, 8, 1); /* index */ | |
| 483 put_bits(&s->pb, 4, 0); /* DC huffman table index */ | |
| 484 put_bits(&s->pb, 4, 0); /* AC huffman table index */ | |
| 2967 | 485 |
| 0 | 486 /* Cb component */ |
| 487 put_bits(&s->pb, 8, 2); /* index */ | |
| 488 put_bits(&s->pb, 4, 1); /* DC huffman table index */ | |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
489 put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */ |
| 2967 | 490 |
| 0 | 491 /* Cr component */ |
| 492 put_bits(&s->pb, 8, 3); /* index */ | |
| 493 put_bits(&s->pb, 4, 1); /* DC huffman table index */ | |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
494 put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */ |
| 0 | 495 |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
496 put_bits(&s->pb, 8, (lossless && !ls) ? s->avctx->prediction_method+1 : 0); /* Ss (not used) */ |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
497 |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
498 switch(s->avctx->codec_id){ |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
499 case CODEC_ID_MJPEG: put_bits(&s->pb, 8, 63); break; /* Se (not used) */ |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
500 case CODEC_ID_LJPEG: put_bits(&s->pb, 8, 0); break; /* not used */ |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
501 case CODEC_ID_JPEGLS: put_bits(&s->pb, 8, 1); break; /* ILV = line interleaved */ |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
502 default: assert(0); |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
503 } |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
504 |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
505 put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */ |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
506 |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
507 //FIXME DC/AC entropy table selectors stuff in jpegls |
| 0 | 508 } |
| 509 | |
| 841 | 510 static void escape_FF(MpegEncContext *s, int start) |
| 840 | 511 { |
| 1786 | 512 int size= put_bits_count(&s->pb) - start*8; |
| 840 | 513 int i, ff_count; |
| 841 | 514 uint8_t *buf= s->pb.buf + start; |
| 1266 | 515 int align= (-(size_t)(buf))&3; |
| 2967 | 516 |
| 840 | 517 assert((size&7) == 0); |
| 518 size >>= 3; | |
| 2967 | 519 |
| 840 | 520 ff_count=0; |
| 521 for(i=0; i<size && i<align; i++){ | |
| 522 if(buf[i]==0xFF) ff_count++; | |
| 523 } | |
| 524 for(; i<size-15; i+=16){ | |
| 525 int acc, v; | |
| 526 | |
| 527 v= *(uint32_t*)(&buf[i]); | |
| 528 acc= (((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
| 529 v= *(uint32_t*)(&buf[i+4]); | |
| 530 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
| 531 v= *(uint32_t*)(&buf[i+8]); | |
| 532 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
| 533 v= *(uint32_t*)(&buf[i+12]); | |
| 534 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010; | |
| 535 | |
| 536 acc>>=4; | |
| 537 acc+= (acc>>16); | |
| 538 acc+= (acc>>8); | |
| 539 ff_count+= acc&0xFF; | |
| 540 } | |
| 541 for(; i<size; i++){ | |
| 542 if(buf[i]==0xFF) ff_count++; | |
| 543 } | |
| 544 | |
| 545 if(ff_count==0) return; | |
| 2967 | 546 |
| 840 | 547 /* skip put bits */ |
| 548 for(i=0; i<ff_count-3; i+=4) | |
| 549 put_bits(&s->pb, 32, 0); | |
| 550 put_bits(&s->pb, (ff_count-i)*8, 0); | |
| 2967 | 551 flush_put_bits(&s->pb); |
| 840 | 552 |
| 553 for(i=size-1; ff_count; i--){ | |
| 554 int v= buf[i]; | |
| 555 | |
| 556 if(v==0xFF){ | |
| 557 //printf("%d %d\n", i, ff_count); | |
| 558 buf[i+ff_count]= 0; | |
| 559 ff_count--; | |
| 560 } | |
| 561 | |
| 562 buf[i+ff_count]= v; | |
| 563 } | |
| 564 } | |
| 565 | |
| 1799 | 566 void ff_mjpeg_stuffing(PutBitContext * pbc) |
| 567 { | |
| 568 int length; | |
| 569 length= (-put_bits_count(pbc))&7; | |
| 570 if(length) put_bits(pbc, length, (1<<length)-1); | |
| 571 } | |
| 572 | |
| 0 | 573 void mjpeg_picture_trailer(MpegEncContext *s) |
| 574 { | |
| 1799 | 575 ff_mjpeg_stuffing(&s->pb); |
| 840 | 576 flush_put_bits(&s->pb); |
| 577 | |
| 841 | 578 assert((s->header_bits&7)==0); |
| 2967 | 579 |
| 841 | 580 escape_FF(s, s->header_bits>>3); |
| 840 | 581 |
| 0 | 582 put_marker(&s->pb, EOI); |
| 583 } | |
| 584 | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
585 static inline void mjpeg_encode_dc(MpegEncContext *s, int val, |
| 2979 | 586 uint8_t *huff_size, uint16_t *huff_code) |
| 0 | 587 { |
| 588 int mant, nbits; | |
| 589 | |
| 590 if (val == 0) { | |
| 840 | 591 put_bits(&s->pb, huff_size[0], huff_code[0]); |
| 0 | 592 } else { |
| 593 mant = val; | |
| 594 if (val < 0) { | |
| 595 val = -val; | |
| 596 mant--; | |
| 597 } | |
| 2967 | 598 |
| 1325 | 599 nbits= av_log2_16bit(val) + 1; |
| 2967 | 600 |
| 840 | 601 put_bits(&s->pb, huff_size[nbits], huff_code[nbits]); |
| 2967 | 602 |
| 840 | 603 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); |
| 0 | 604 } |
| 605 } | |
| 606 | |
| 607 static void encode_block(MpegEncContext *s, DCTELEM *block, int n) | |
| 608 { | |
| 609 int mant, nbits, code, i, j; | |
| 610 int component, dc, run, last_index, val; | |
| 611 MJpegContext *m = s->mjpeg_ctx; | |
| 1064 | 612 uint8_t *huff_size_ac; |
| 613 uint16_t *huff_code_ac; | |
| 2967 | 614 |
| 0 | 615 /* DC coef */ |
| 616 component = (n <= 3 ? 0 : n - 4 + 1); | |
| 617 dc = block[0]; /* overflow is impossible */ | |
| 618 val = dc - s->last_dc[component]; | |
| 619 if (n < 4) { | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
620 mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance); |
| 0 | 621 huff_size_ac = m->huff_size_ac_luminance; |
| 622 huff_code_ac = m->huff_code_ac_luminance; | |
| 623 } else { | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
624 mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); |
| 0 | 625 huff_size_ac = m->huff_size_ac_chrominance; |
| 626 huff_code_ac = m->huff_code_ac_chrominance; | |
| 627 } | |
| 628 s->last_dc[component] = dc; | |
| 2967 | 629 |
| 0 | 630 /* AC coefs */ |
| 2967 | 631 |
| 0 | 632 run = 0; |
| 633 last_index = s->block_last_index[n]; | |
| 634 for(i=1;i<=last_index;i++) { | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
635 j = s->intra_scantable.permutated[i]; |
| 0 | 636 val = block[j]; |
| 637 if (val == 0) { | |
| 638 run++; | |
| 639 } else { | |
| 640 while (run >= 16) { | |
| 840 | 641 put_bits(&s->pb, huff_size_ac[0xf0], huff_code_ac[0xf0]); |
| 0 | 642 run -= 16; |
| 643 } | |
| 644 mant = val; | |
| 645 if (val < 0) { | |
| 646 val = -val; | |
| 647 mant--; | |
| 648 } | |
| 2967 | 649 |
| 1280 | 650 nbits= av_log2(val) + 1; |
| 0 | 651 code = (run << 4) | nbits; |
| 652 | |
| 840 | 653 put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]); |
| 2967 | 654 |
| 840 | 655 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); |
| 0 | 656 run = 0; |
| 657 } | |
| 658 } | |
| 659 | |
| 660 /* output EOB only if not already 64 values */ | |
| 661 if (last_index < 63 || run != 0) | |
| 840 | 662 put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]); |
| 0 | 663 } |
| 664 | |
| 2967 | 665 void mjpeg_encode_mb(MpegEncContext *s, |
| 0 | 666 DCTELEM block[6][64]) |
| 667 { | |
| 668 int i; | |
| 669 for(i=0;i<6;i++) { | |
| 670 encode_block(s, block[i], i); | |
| 671 } | |
| 672 } | |
| 23 | 673 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
674 static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
675 MpegEncContext * const s = avctx->priv_data; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
676 MJpegContext * const m = s->mjpeg_ctx; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
677 AVFrame *pict = data; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
678 const int width= s->width; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
679 const int height= s->height; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
680 AVFrame * const p= (AVFrame*)&s->current_picture; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
681 const int predictor= avctx->prediction_method+1; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
682 |
|
1522
79dddc5cd990
removed the obsolete and unused parameters of init_put_bits
alex
parents:
1519
diff
changeset
|
683 init_put_bits(&s->pb, buf, buf_size); |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
684 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
685 *p = *pict; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
686 p->pict_type= FF_I_TYPE; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
687 p->key_frame= 1; |
| 2967 | 688 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
689 mjpeg_picture_header(s); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
690 |
| 1786 | 691 s->header_bits= put_bits_count(&s->pb); |
| 2967 | 692 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
693 if(avctx->pix_fmt == PIX_FMT_RGBA32){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
694 int x, y, i; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
695 const int linesize= p->linesize[0]; |
|
2522
e25782262d7d
kill warnings patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents:
2453
diff
changeset
|
696 uint16_t (*buffer)[4]= (void *) s->rd_scratchpad; |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
697 int left[3], top[3], topleft[3]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
698 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
699 for(i=0; i<3; i++){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
700 buffer[0][i]= 1 << (9 - 1); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
701 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
702 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
703 for(y = 0; y < height; y++) { |
| 1363 | 704 const int modified_predictor= y ? predictor : 1; |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
705 uint8_t *ptr = p->data[0] + (linesize * y); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
706 |
| 2422 | 707 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < width*3*4){ |
| 708 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
| 709 return -1; | |
| 710 } | |
| 2967 | 711 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
712 for(i=0; i<3; i++){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
713 top[i]= left[i]= topleft[i]= buffer[0][i]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
714 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
715 for(x = 0; x < width; x++) { |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
716 buffer[x][1] = ptr[4*x+0] - ptr[4*x+1] + 0x100; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
717 buffer[x][2] = ptr[4*x+2] - ptr[4*x+1] + 0x100; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
718 buffer[x][0] = (ptr[4*x+0] + 2*ptr[4*x+1] + ptr[4*x+2])>>2; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
719 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
720 for(i=0;i<3;i++) { |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
721 int pred, diff; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
722 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
723 PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); |
| 2967 | 724 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
725 topleft[i]= top[i]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
726 top[i]= buffer[x+1][i]; |
| 2967 | 727 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
728 left[i]= buffer[x][i]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
729 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
730 diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100; |
| 2967 | 731 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
732 if(i==0) |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
733 mjpeg_encode_dc(s, diff, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
734 else |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
735 mjpeg_encode_dc(s, diff, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
736 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
737 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
738 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
739 }else{ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
740 int mb_x, mb_y, i; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
741 const int mb_width = (width + s->mjpeg_hsample[0] - 1) / s->mjpeg_hsample[0]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
742 const int mb_height = (height + s->mjpeg_vsample[0] - 1) / s->mjpeg_vsample[0]; |
| 2967 | 743 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
744 for(mb_y = 0; mb_y < mb_height; mb_y++) { |
| 2422 | 745 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < mb_width * 4 * 3 * s->mjpeg_hsample[0] * s->mjpeg_vsample[0]){ |
| 746 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n"); | |
| 747 return -1; | |
| 748 } | |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
749 for(mb_x = 0; mb_x < mb_width; mb_x++) { |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
750 if(mb_x==0 || mb_y==0){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
751 for(i=0;i<3;i++) { |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
752 uint8_t *ptr; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
753 int x, y, h, v, linesize; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
754 h = s->mjpeg_hsample[i]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
755 v = s->mjpeg_vsample[i]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
756 linesize= p->linesize[i]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
757 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
758 for(y=0; y<v; y++){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
759 for(x=0; x<h; x++){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
760 int pred; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
761 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
762 ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
763 if(y==0 && mb_y==0){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
764 if(x==0 && mb_x==0){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
765 pred= 128; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
766 }else{ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
767 pred= ptr[-1]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
768 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
769 }else{ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
770 if(x==0 && mb_x==0){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
771 pred= ptr[-linesize]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
772 }else{ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
773 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
774 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
775 } |
| 2967 | 776 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
777 if(i==0) |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
778 mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
779 else |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
780 mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
781 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
782 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
783 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
784 }else{ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
785 for(i=0;i<3;i++) { |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
786 uint8_t *ptr; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
787 int x, y, h, v, linesize; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
788 h = s->mjpeg_hsample[i]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
789 v = s->mjpeg_vsample[i]; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
790 linesize= p->linesize[i]; |
| 2967 | 791 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
792 for(y=0; y<v; y++){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
793 for(x=0; x<h; x++){ |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
794 int pred; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
795 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
796 ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap |
| 2967 | 797 //printf("%d %d %d %d %8X\n", mb_x, mb_y, x, y, ptr); |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
798 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
799 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
800 if(i==0) |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
801 mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
802 else |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
803 mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
804 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
805 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
806 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
807 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
808 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
809 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
810 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
811 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
812 emms_c(); |
| 2967 | 813 |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
814 mjpeg_picture_trailer(s); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
815 s->picture_number++; |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
816 |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
817 flush_put_bits(&s->pb); |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
818 return pbBufPtr(&s->pb) - s->pb.buf; |
| 1786 | 819 // return (put_bits_count(&f->pb)+7)/8; |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
820 } |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
821 |
| 1325 | 822 #endif //CONFIG_ENCODERS |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
823 |
| 23 | 824 /******************************************/ |
| 825 /* decoding */ | |
| 826 | |
| 827 #define MAX_COMPONENTS 4 | |
| 828 | |
| 829 typedef struct MJpegDecodeContext { | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
830 AVCodecContext *avctx; |
| 23 | 831 GetBitContext gb; |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
832 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
|
833 |
| 23 | 834 int start_code; /* current start code */ |
| 835 int buffer_size; | |
| 1064 | 836 uint8_t *buffer; |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
837 |
| 1064 | 838 int16_t quant_matrixes[4][64]; |
| 23 | 839 VLC vlcs[2][4]; |
| 1358 | 840 int qscale[4]; ///< quantizer scale calculated from quant_matrixes |
| 53 | 841 |
|
1679
55c03fa692a9
set AVCodecContext.width/height before get_buffer()
michael
parents:
1619
diff
changeset
|
842 int org_height; /* size given at codec init */ |
| 53 | 843 int first_picture; /* true if decoding first picture */ |
| 844 int interlaced; /* true if interlaced */ | |
| 845 int bottom_field; /* true if bottom field */ | |
| 1307 | 846 int lossless; |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
847 int ls; |
| 1307 | 848 int rgb; |
| 2967 | 849 int rct; /* standard rct */ |
| 850 int pegasus_rct; /* pegasus reversible colorspace transform */ | |
| 1310 | 851 int bits; /* bits per component */ |
| 53 | 852 |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
853 int maxval; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
854 int near; ///< near lossless bound (si 0 for lossless) |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
855 int t1,t2,t3; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
856 int reset; ///< context halfing intervall ?rename |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
857 |
| 23 | 858 int width, height; |
| 1359 | 859 int mb_width, mb_height; |
| 26 | 860 int nb_components; |
| 861 int component_id[MAX_COMPONENTS]; | |
| 23 | 862 int h_count[MAX_COMPONENTS]; /* horizontal and vertical count for each component */ |
| 863 int v_count[MAX_COMPONENTS]; | |
| 1359 | 864 int comp_index[MAX_COMPONENTS]; |
| 865 int dc_index[MAX_COMPONENTS]; | |
| 866 int ac_index[MAX_COMPONENTS]; | |
| 867 int nb_blocks[MAX_COMPONENTS]; | |
| 868 int h_scount[MAX_COMPONENTS]; | |
| 869 int v_scount[MAX_COMPONENTS]; | |
| 23 | 870 int h_max, v_max; /* maximum h and v counts */ |
| 871 int quant_index[4]; /* quant table index for each component */ | |
| 872 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */ | |
| 1513 | 873 AVFrame picture; /* picture structure */ |
| 874 int linesize[MAX_COMPONENTS]; ///< linesize << interlaced | |
|
2367
c353719836af
fix some type mismatches patch by (Jeff Muizelaar <muizelaar rogers com>)
michael
parents:
2360
diff
changeset
|
875 int8_t *qscale_table; |
| 23 | 876 DCTELEM block[64] __align8; |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
877 ScanTable scantable; |
| 1064 | 878 void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/); |
| 354 | 879 |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
880 int restart_interval; |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
881 int restart_count; |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
882 |
|
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
883 int buggy_avid; |
| 2442 | 884 int cs_itu601; |
|
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
885 int interlace_polarity; |
|
2333
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
886 |
|
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
887 int mjpb_skiptosod; |
| 23 | 888 } MJpegDecodeContext; |
| 889 | |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
890 #include "jpeg_ls.c" //FIXME make jpeg-ls more independant |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
891 |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
892 static int mjpeg_decode_dht(MJpegDecodeContext *s); |
| 375 | 893 |
| 2967 | 894 static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table, |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2367
diff
changeset
|
895 int nb_codes, int use_static) |
| 29 | 896 { |
| 1064 | 897 uint8_t huff_size[256]; |
| 898 uint16_t huff_code[256]; | |
| 29 | 899 |
| 900 memset(huff_size, 0, sizeof(huff_size)); | |
| 901 build_huffman_codes(huff_size, huff_code, bits_table, val_table); | |
| 2967 | 902 |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2367
diff
changeset
|
903 return init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2, use_static); |
| 29 | 904 } |
| 905 | |
| 23 | 906 static int mjpeg_decode_init(AVCodecContext *avctx) |
| 907 { | |
| 908 MJpegDecodeContext *s = avctx->priv_data; | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
909 MpegEncContext s2; |
|
2802
4db6127e20b8
reset restart_count when restart_interval is set and fill the
reimar
parents:
2799
diff
changeset
|
910 memset(s, 0, sizeof(MJpegDecodeContext)); |
| 23 | 911 |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
912 s->avctx = avctx; |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
913 |
| 1092 | 914 /* ugly way to get the idct & scantable FIXME */ |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
915 memset(&s2, 0, sizeof(MpegEncContext)); |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
916 s2.avctx= avctx; |
|
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
917 // s2->out_format = FMT_MJPEG; |
| 1892 | 918 dsputil_init(&s2.dsp, avctx); |
| 919 DCT_common_init(&s2); | |
| 920 | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
921 s->scantable= s2.intra_scantable; |
| 1092 | 922 s->idct_put= s2.dsp.idct_put; |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
923 |
| 23 | 924 s->mpeg_enc_ctx_allocated = 0; |
|
2799
924c7e66ced8
dont pre allocate uselessly large buffer and dont ignore FF_INPUT_BUFFER_PADDING_SIZE
michael
parents:
2798
diff
changeset
|
925 s->buffer_size = 0; |
|
924c7e66ced8
dont pre allocate uselessly large buffer and dont ignore FF_INPUT_BUFFER_PADDING_SIZE
michael
parents:
2798
diff
changeset
|
926 s->buffer = NULL; |
| 23 | 927 s->start_code = -1; |
| 53 | 928 s->first_picture = 1; |
| 2270 | 929 s->org_height = avctx->coded_height; |
| 2967 | 930 |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2367
diff
changeset
|
931 build_vlc(&s->vlcs[0][0], bits_dc_luminance, val_dc_luminance, 12, 0); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2367
diff
changeset
|
932 build_vlc(&s->vlcs[0][1], bits_dc_chrominance, val_dc_chrominance, 12, 0); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2367
diff
changeset
|
933 build_vlc(&s->vlcs[1][0], bits_ac_luminance, val_ac_luminance, 251, 0); |
|
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2367
diff
changeset
|
934 build_vlc(&s->vlcs[1][1], bits_ac_chrominance, val_ac_chrominance, 251, 0); |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
935 |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
936 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
|
937 { |
| 2979 | 938 av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n"); |
| 939 init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8); | |
| 940 mjpeg_decode_dht(s); | |
| 941 /* should check for error - but dunno */ | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
942 } |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
943 |
| 23 | 944 return 0; |
| 945 } | |
| 946 | |
| 2319 | 947 |
| 948 /** | |
| 949 * finds the end of the current frame in the bitstream. | |
| 950 * @return the position of the first byte of the next frame, or -1 | |
| 951 */ | |
| 952 static int find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ | |
| 953 int vop_found, i; | |
| 954 uint16_t state; | |
| 2967 | 955 |
| 2319 | 956 vop_found= pc->frame_start_found; |
| 957 state= pc->state; | |
| 2967 | 958 |
| 2319 | 959 i=0; |
| 960 if(!vop_found){ | |
| 961 for(i=0; i<buf_size; i++){ | |
| 962 state= (state<<8) | buf[i]; | |
| 963 if(state == 0xFFD8){ | |
| 964 i++; | |
| 965 vop_found=1; | |
| 966 break; | |
| 967 } | |
| 968 } | |
| 969 } | |
| 970 | |
| 971 if(vop_found){ | |
| 972 /* EOF considered as end of frame */ | |
| 973 if (buf_size == 0) | |
| 974 return 0; | |
| 975 for(; i<buf_size; i++){ | |
| 976 state= (state<<8) | buf[i]; | |
| 977 if(state == 0xFFD8){ | |
| 978 pc->frame_start_found=0; | |
| 2967 | 979 pc->state=0; |
| 2319 | 980 return i-1; |
| 981 } | |
| 982 } | |
| 983 } | |
| 984 pc->frame_start_found= vop_found; | |
| 985 pc->state= state; | |
| 986 return END_NOT_FOUND; | |
| 987 } | |
| 988 | |
| 989 static int jpeg_parse(AVCodecParserContext *s, | |
| 990 AVCodecContext *avctx, | |
| 2967 | 991 uint8_t **poutbuf, int *poutbuf_size, |
| 2319 | 992 const uint8_t *buf, int buf_size) |
| 993 { | |
| 994 ParseContext *pc = s->priv_data; | |
| 995 int next; | |
| 2967 | 996 |
| 2319 | 997 next= find_frame_end(pc, buf, buf_size); |
| 998 | |
| 999 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { | |
| 1000 *poutbuf = NULL; | |
| 1001 *poutbuf_size = 0; | |
| 1002 return buf_size; | |
| 1003 } | |
| 1004 | |
| 1005 *poutbuf = (uint8_t *)buf; | |
| 1006 *poutbuf_size = buf_size; | |
| 1007 return next; | |
| 1008 } | |
| 1009 | |
| 23 | 1010 /* quantize tables */ |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1011 static int mjpeg_decode_dqt(MJpegDecodeContext *s) |
| 23 | 1012 { |
| 37 | 1013 int len, index, i, j; |
| 2967 | 1014 |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1015 len = get_bits(&s->gb, 16) - 2; |
| 23 | 1016 |
| 1017 while (len >= 65) { | |
| 1018 /* only 8 bit precision handled */ | |
| 1019 if (get_bits(&s->gb, 4) != 0) | |
| 2979 | 1020 { |
| 1021 dprintf("dqt: 16bit precision\n"); | |
| 23 | 1022 return -1; |
| 2979 | 1023 } |
| 23 | 1024 index = get_bits(&s->gb, 4); |
| 1025 if (index >= 4) | |
| 1026 return -1; | |
| 1027 dprintf("index=%d\n", index); | |
| 1028 /* read quant table */ | |
| 37 | 1029 for(i=0;i<64;i++) { |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
1030 j = s->scantable.permutated[i]; |
| 2979 | 1031 s->quant_matrixes[index][j] = get_bits(&s->gb, 8); |
| 37 | 1032 } |
| 1358 | 1033 |
| 1034 //XXX FIXME finetune, and perhaps add dc too | |
| 1035 s->qscale[index]= FFMAX( | |
| 1036 s->quant_matrixes[index][s->scantable.permutated[1]], | |
| 1037 s->quant_matrixes[index][s->scantable.permutated[8]]) >> 1; | |
| 2979 | 1038 dprintf("qscale[%d]: %d\n", index, s->qscale[index]); |
| 23 | 1039 len -= 65; |
| 1040 } | |
| 2967 | 1041 |
| 23 | 1042 return 0; |
| 1043 } | |
| 1044 | |
| 1045 /* decode huffman tables and build VLC decoders */ | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1046 static int mjpeg_decode_dht(MJpegDecodeContext *s) |
| 23 | 1047 { |
| 1048 int len, index, i, class, n, v, code_max; | |
| 1064 | 1049 uint8_t bits_table[17]; |
| 1050 uint8_t val_table[256]; | |
| 2967 | 1051 |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1052 len = get_bits(&s->gb, 16) - 2; |
| 23 | 1053 |
| 1054 while (len > 0) { | |
| 1055 if (len < 17) | |
| 1056 return -1; | |
| 1057 class = get_bits(&s->gb, 4); | |
| 1058 if (class >= 2) | |
| 1059 return -1; | |
| 1060 index = get_bits(&s->gb, 4); | |
| 1061 if (index >= 4) | |
| 1062 return -1; | |
| 1063 n = 0; | |
| 1064 for(i=1;i<=16;i++) { | |
| 1065 bits_table[i] = get_bits(&s->gb, 8); | |
| 1066 n += bits_table[i]; | |
| 1067 } | |
| 1068 len -= 17; | |
| 1069 if (len < n || n > 256) | |
| 1070 return -1; | |
| 1071 | |
| 1072 code_max = 0; | |
| 1073 for(i=0;i<n;i++) { | |
| 1074 v = get_bits(&s->gb, 8); | |
| 1075 if (v > code_max) | |
| 1076 code_max = v; | |
| 1077 val_table[i] = v; | |
| 1078 } | |
| 1079 len -= n; | |
| 1080 | |
| 1081 /* build VLC and flush previous vlc if present */ | |
| 1082 free_vlc(&s->vlcs[class][index]); | |
| 1083 dprintf("class=%d index=%d nb_codes=%d\n", | |
| 1084 class, index, code_max + 1); | |
|
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2367
diff
changeset
|
1085 if(build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1, 0) < 0){ |
| 1351 | 1086 return -1; |
| 1087 } | |
| 23 | 1088 } |
| 1089 return 0; | |
| 1090 } | |
| 1091 | |
| 1307 | 1092 static int mjpeg_decode_sof(MJpegDecodeContext *s) |
| 23 | 1093 { |
| 26 | 1094 int len, nb_components, i, width, height; |
| 23 | 1095 |
| 1096 /* XXX: verify len field validity */ | |
| 1097 len = get_bits(&s->gb, 16); | |
| 1310 | 1098 s->bits= get_bits(&s->gb, 8); |
| 2967 | 1099 |
| 1100 if(s->pegasus_rct) s->bits=9; | |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
1101 if(s->bits==9 && !s->pegasus_rct) s->rct=1; //FIXME ugly |
| 1310 | 1102 |
| 1103 if (s->bits != 8 && !s->lossless){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1560
diff
changeset
|
1104 av_log(s->avctx, AV_LOG_ERROR, "only 8 bits/component accepted\n"); |
| 23 | 1105 return -1; |
| 1307 | 1106 } |
| 23 | 1107 height = get_bits(&s->gb, 16); |
| 1108 width = get_bits(&s->gb, 16); | |
| 2967 | 1109 |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1110 dprintf("sof0: picture: %dx%d\n", width, height); |
| 2422 | 1111 if(avcodec_check_dimensions(s->avctx, width, height)) |
| 1112 return -1; | |
| 23 | 1113 |
| 1114 nb_components = get_bits(&s->gb, 8); | |
| 1115 if (nb_components <= 0 || | |
| 1116 nb_components > MAX_COMPONENTS) | |
| 1117 return -1; | |
| 26 | 1118 s->nb_components = nb_components; |
| 23 | 1119 s->h_max = 1; |
| 1120 s->v_max = 1; | |
| 1121 for(i=0;i<nb_components;i++) { | |
| 1122 /* component id */ | |
| 26 | 1123 s->component_id[i] = get_bits(&s->gb, 8) - 1; |
| 23 | 1124 s->h_count[i] = get_bits(&s->gb, 4); |
| 1125 s->v_count[i] = get_bits(&s->gb, 4); | |
| 1126 /* compute hmax and vmax (only used in interleaved case) */ | |
| 1127 if (s->h_count[i] > s->h_max) | |
| 1128 s->h_max = s->h_count[i]; | |
| 1129 if (s->v_count[i] > s->v_max) | |
| 1130 s->v_max = s->v_count[i]; | |
| 1131 s->quant_index[i] = get_bits(&s->gb, 8); | |
| 1132 if (s->quant_index[i] >= 4) | |
| 1133 return -1; | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1134 dprintf("component %d %d:%d id: %d quant:%d\n", i, s->h_count[i], |
| 2979 | 1135 s->v_count[i], s->component_id[i], s->quant_index[i]); |
| 23 | 1136 } |
| 2967 | 1137 |
| 1310 | 1138 if(s->v_max==1 && s->h_max==1 && s->lossless==1) s->rgb=1; |
| 23 | 1139 |
| 1140 /* if different size, realloc/alloc picture */ | |
| 1141 /* XXX: also check h_count and v_count */ | |
| 1142 if (width != s->width || height != s->height) { | |
| 1358 | 1143 av_freep(&s->qscale_table); |
| 2967 | 1144 |
| 23 | 1145 s->width = width; |
| 1146 s->height = height; | |
|
1679
55c03fa692a9
set AVCodecContext.width/height before get_buffer()
michael
parents:
1619
diff
changeset
|
1147 |
| 53 | 1148 /* test interlaced mode */ |
| 1149 if (s->first_picture && | |
| 1150 s->org_height != 0 && | |
| 1151 s->height < ((s->org_height * 3) / 4)) { | |
| 1152 s->interlaced = 1; | |
| 2979 | 1153 // s->bottom_field = (s->interlace_polarity) ? 1 : 0; |
|
1679
55c03fa692a9
set AVCodecContext.width/height before get_buffer()
michael
parents:
1619
diff
changeset
|
1154 s->bottom_field = 0; |
|
3062
8d05d4036b6a
Mjpeg interlaced decoding fix, height was wrong while decoding (/2).
banan
parents:
3036
diff
changeset
|
1155 height *= 2; |
| 53 | 1156 } |
| 1157 | |
|
3062
8d05d4036b6a
Mjpeg interlaced decoding fix, height was wrong while decoding (/2).
banan
parents:
3036
diff
changeset
|
1158 avcodec_set_dimensions(s->avctx, width, height); |
|
8d05d4036b6a
Mjpeg interlaced decoding fix, height was wrong while decoding (/2).
banan
parents:
3036
diff
changeset
|
1159 |
| 1358 | 1160 s->qscale_table= av_mallocz((s->width+15)/16); |
| 1161 | |
| 53 | 1162 s->first_picture = 0; |
| 23 | 1163 } |
| 2967 | 1164 |
| 1513 | 1165 if(s->interlaced && s->bottom_field) |
| 1166 return 0; | |
| 2967 | 1167 |
| 1513 | 1168 /* XXX: not complete test ! */ |
| 1169 switch((s->h_count[0] << 4) | s->v_count[0]) { | |
| 1170 case 0x11: | |
| 1171 if(s->rgb){ | |
| 1172 s->avctx->pix_fmt = PIX_FMT_RGBA32; | |
|
1740
0c686b4cd576
grayscale mjpeg decoding support based upon a patch by (Leon Bottou (leonb))
michael
parents:
1679
diff
changeset
|
1173 }else if(s->nb_components==3) |
| 2442 | 1174 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV444P : PIX_FMT_YUVJ444P; |
|
1740
0c686b4cd576
grayscale mjpeg decoding support based upon a patch by (Leon Bottou (leonb))
michael
parents:
1679
diff
changeset
|
1175 else |
|
0c686b4cd576
grayscale mjpeg decoding support based upon a patch by (Leon Bottou (leonb))
michael
parents:
1679
diff
changeset
|
1176 s->avctx->pix_fmt = PIX_FMT_GRAY8; |
| 1513 | 1177 break; |
| 1178 case 0x21: | |
| 2442 | 1179 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV422P : PIX_FMT_YUVJ422P; |
| 1513 | 1180 break; |
| 1181 default: | |
| 1182 case 0x22: | |
| 2442 | 1183 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV420P : PIX_FMT_YUVJ420P; |
| 1513 | 1184 break; |
| 1185 } | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1186 |
| 1513 | 1187 if(s->picture.data[0]) |
| 1188 s->avctx->release_buffer(s->avctx, &s->picture); | |
| 1189 | |
| 1190 s->picture.reference= 0; | |
| 1191 if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){ | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1560
diff
changeset
|
1192 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
| 1513 | 1193 return -1; |
| 1194 } | |
| 1195 s->picture.pict_type= I_TYPE; | |
| 1196 s->picture.key_frame= 1; | |
| 2967 | 1197 |
| 1513 | 1198 for(i=0; i<3; i++){ |
| 1199 s->linesize[i]= s->picture.linesize[i] << s->interlaced; | |
| 1200 } | |
| 1201 | |
| 1202 // printf("%d %d %d %d %d %d\n", s->width, s->height, s->linesize[0], s->linesize[1], s->interlaced, s->avctx->height); | |
| 2967 | 1203 |
| 354 | 1204 if (len != (8+(3*nb_components))) |
| 1205 { | |
| 2979 | 1206 dprintf("decode_sof0: error, len(%d) mismatch\n", len); |
| 354 | 1207 } |
| 2967 | 1208 |
| 23 | 1209 return 0; |
| 1210 } | |
| 1211 | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
1212 static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index) |
| 23 | 1213 { |
| 1280 | 1214 int code; |
| 780 | 1215 code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2); |
| 23 | 1216 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
|
1217 { |
| 2979 | 1218 dprintf("mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index, |
| 427 | 1219 &s->vlcs[0][dc_index]); |
| 23 | 1220 return 0xffff; |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1221 } |
| 1280 | 1222 |
| 1223 if(code) | |
| 1224 return get_xbits(&s->gb, code); | |
| 1225 else | |
| 1226 return 0; | |
| 23 | 1227 } |
| 1228 | |
| 1229 /* decode block and dequantize */ | |
| 2967 | 1230 static int decode_block(MJpegDecodeContext *s, DCTELEM *block, |
| 23 | 1231 int component, int dc_index, int ac_index, int quant_index) |
| 1232 { | |
| 1280 | 1233 int code, i, j, level, val; |
| 23 | 1234 VLC *ac_vlc; |
| 1064 | 1235 int16_t *quant_matrix; |
| 23 | 1236 |
| 1237 /* DC coef */ | |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
427
diff
changeset
|
1238 val = mjpeg_decode_dc(s, dc_index); |
| 23 | 1239 if (val == 0xffff) { |
| 1240 dprintf("error dc\n"); | |
| 1241 return -1; | |
| 1242 } | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1243 quant_matrix = s->quant_matrixes[quant_index]; |
| 23 | 1244 val = val * quant_matrix[0] + s->last_dc[component]; |
| 1245 s->last_dc[component] = val; | |
| 1246 block[0] = val; | |
| 1247 /* AC coefs */ | |
| 1248 ac_vlc = &s->vlcs[1][ac_index]; | |
| 1249 i = 1; | |
| 1250 for(;;) { | |
| 2979 | 1251 code = get_vlc2(&s->gb, s->vlcs[1][ac_index].table, 9, 2); |
| 1275 | 1252 |
| 23 | 1253 if (code < 0) { |
| 1254 dprintf("error ac\n"); | |
| 1255 return -1; | |
| 1256 } | |
| 1257 /* EOB */ | |
| 1258 if (code == 0) | |
| 1259 break; | |
| 1260 if (code == 0xf0) { | |
| 1261 i += 16; | |
| 1262 } else { | |
| 1280 | 1263 level = get_xbits(&s->gb, code & 0xf); |
| 1264 i += code >> 4; | |
| 23 | 1265 if (i >= 64) { |
| 1266 dprintf("error count: %d\n", i); | |
| 1267 return -1; | |
| 1268 } | |
|
706
e65798d228ea
idct permutation cleanup, idct can be selected per context now
michaelni
parents:
676
diff
changeset
|
1269 j = s->scantable.permutated[i]; |
| 23 | 1270 block[j] = level * quant_matrix[j]; |
| 1271 i++; | |
|
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1272 if (i >= 64) |
|
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1273 break; |
| 23 | 1274 } |
| 1275 } | |
| 1276 return 0; | |
| 1277 } | |
| 1278 | |
| 1359 | 1279 static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor, int point_transform){ |
| 1280 int i, mb_x, mb_y; | |
| 2422 | 1281 uint16_t buffer[32768][4]; |
| 1359 | 1282 int left[3], top[3], topleft[3]; |
| 1283 const int linesize= s->linesize[0]; | |
| 1284 const int mask= (1<<s->bits)-1; | |
| 2967 | 1285 |
| 2422 | 1286 if((unsigned)s->mb_width > 32768) //dynamic alloc |
| 1287 return -1; | |
| 2967 | 1288 |
| 1359 | 1289 for(i=0; i<3; i++){ |
| 1290 buffer[0][i]= 1 << (s->bits + point_transform - 1); | |
| 1291 } | |
| 1292 for(mb_y = 0; mb_y < s->mb_height; mb_y++) { | |
| 1363 | 1293 const int modified_predictor= mb_y ? predictor : 1; |
| 1513 | 1294 uint8_t *ptr = s->picture.data[0] + (linesize * mb_y); |
| 1359 | 1295 |
| 1296 if (s->interlaced && s->bottom_field) | |
| 1297 ptr += linesize >> 1; | |
| 1298 | |
| 1299 for(i=0; i<3; i++){ | |
| 1300 top[i]= left[i]= topleft[i]= buffer[0][i]; | |
| 1301 } | |
| 1302 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
| 1303 if (s->restart_interval && !s->restart_count) | |
| 1304 s->restart_count = s->restart_interval; | |
| 1305 | |
| 1306 for(i=0;i<3;i++) { | |
| 1307 int pred; | |
| 1308 | |
| 1309 topleft[i]= top[i]; | |
| 1310 top[i]= buffer[mb_x][i]; | |
| 1311 | |
| 1312 PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); | |
| 2967 | 1313 |
| 1314 left[i]= | |
| 1359 | 1315 buffer[mb_x][i]= mask & (pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform)); |
| 1316 } | |
| 1317 | |
| 1318 if (s->restart_interval && !--s->restart_count) { | |
| 1319 align_get_bits(&s->gb); | |
| 1320 skip_bits(&s->gb, 16); /* skip RSTn */ | |
| 1321 } | |
| 1322 } | |
| 1323 | |
| 1324 if(s->rct){ | |
| 1325 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
| 1326 ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2] - 0x200)>>2); | |
| 1327 ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1]; | |
| 1328 ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1]; | |
| 1329 } | |
| 1330 }else if(s->pegasus_rct){ | |
| 1331 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
| 1332 ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2])>>2); | |
| 1333 ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1]; | |
| 1334 ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1]; | |
| 1335 } | |
| 1336 }else{ | |
| 1337 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
| 1338 ptr[4*mb_x+0] = buffer[mb_x][0]; | |
| 1339 ptr[4*mb_x+1] = buffer[mb_x][1]; | |
| 1340 ptr[4*mb_x+2] = buffer[mb_x][2]; | |
| 1341 } | |
| 1342 } | |
| 1343 } | |
| 1344 return 0; | |
| 1345 } | |
| 1346 | |
| 1347 static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point_transform){ | |
| 1348 int i, mb_x, mb_y; | |
| 1349 const int nb_components=3; | |
| 1350 | |
| 1351 for(mb_y = 0; mb_y < s->mb_height; mb_y++) { | |
| 1352 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
| 1353 if (s->restart_interval && !s->restart_count) | |
| 1354 s->restart_count = s->restart_interval; | |
| 1355 | |
| 1356 if(mb_x==0 || mb_y==0 || s->interlaced){ | |
| 1357 for(i=0;i<nb_components;i++) { | |
| 1358 uint8_t *ptr; | |
| 1359 int n, h, v, x, y, c, j, linesize; | |
| 1360 n = s->nb_blocks[i]; | |
| 1361 c = s->comp_index[i]; | |
| 1362 h = s->h_scount[i]; | |
| 1363 v = s->v_scount[i]; | |
| 1364 x = 0; | |
| 1365 y = 0; | |
| 1366 linesize= s->linesize[c]; | |
| 2967 | 1367 |
| 1359 | 1368 for(j=0; j<n; j++) { |
| 1369 int pred; | |
| 1370 | |
| 1513 | 1371 ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap |
| 1359 | 1372 if(y==0 && mb_y==0){ |
| 1373 if(x==0 && mb_x==0){ | |
| 1374 pred= 128 << point_transform; | |
| 1375 }else{ | |
| 1376 pred= ptr[-1]; | |
| 1377 } | |
| 1378 }else{ | |
| 1379 if(x==0 && mb_x==0){ | |
| 1380 pred= ptr[-linesize]; | |
| 1381 }else{ | |
| 1382 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); | |
| 1383 } | |
| 1384 } | |
| 2967 | 1385 |
| 1359 | 1386 if (s->interlaced && s->bottom_field) |
| 1387 ptr += linesize >> 1; | |
| 1388 *ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform); | |
| 1389 | |
| 1390 if (++x == h) { | |
| 1391 x = 0; | |
| 1392 y++; | |
| 1393 } | |
| 1394 } | |
| 1395 } | |
| 1396 }else{ | |
| 1397 for(i=0;i<nb_components;i++) { | |
| 1398 uint8_t *ptr; | |
| 1399 int n, h, v, x, y, c, j, linesize; | |
| 1400 n = s->nb_blocks[i]; | |
| 1401 c = s->comp_index[i]; | |
| 1402 h = s->h_scount[i]; | |
| 1403 v = s->v_scount[i]; | |
| 1404 x = 0; | |
| 1405 y = 0; | |
| 1406 linesize= s->linesize[c]; | |
| 2967 | 1407 |
| 1359 | 1408 for(j=0; j<n; j++) { |
| 1409 int pred; | |
| 1410 | |
| 1513 | 1411 ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap |
| 1359 | 1412 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); |
| 1413 *ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform); | |
| 1414 if (++x == h) { | |
| 1415 x = 0; | |
| 1416 y++; | |
| 1417 } | |
| 1418 } | |
| 1419 } | |
| 1420 } | |
| 1421 if (s->restart_interval && !--s->restart_count) { | |
| 1422 align_get_bits(&s->gb); | |
| 1423 skip_bits(&s->gb, 16); /* skip RSTn */ | |
| 1424 } | |
| 1425 } | |
| 1426 } | |
| 1427 return 0; | |
| 1428 } | |
| 1429 | |
| 1430 static int mjpeg_decode_scan(MJpegDecodeContext *s){ | |
| 1431 int i, mb_x, mb_y; | |
| 1432 const int nb_components=3; | |
| 1433 | |
| 1434 for(mb_y = 0; mb_y < s->mb_height; mb_y++) { | |
| 1435 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
| 1436 if (s->restart_interval && !s->restart_count) | |
| 1437 s->restart_count = s->restart_interval; | |
| 1438 | |
| 1439 for(i=0;i<nb_components;i++) { | |
| 1440 uint8_t *ptr; | |
| 1441 int n, h, v, x, y, c, j; | |
| 1442 n = s->nb_blocks[i]; | |
| 1443 c = s->comp_index[i]; | |
| 1444 h = s->h_scount[i]; | |
| 1445 v = s->v_scount[i]; | |
| 1446 x = 0; | |
| 1447 y = 0; | |
| 1448 for(j=0;j<n;j++) { | |
| 1449 memset(s->block, 0, sizeof(s->block)); | |
| 2967 | 1450 if (decode_block(s, s->block, i, |
| 1451 s->dc_index[i], s->ac_index[i], | |
| 1359 | 1452 s->quant_index[c]) < 0) { |
| 1453 dprintf("error y=%d x=%d\n", mb_y, mb_x); | |
| 1454 return -1; | |
| 1455 } | |
| 2979 | 1456 // dprintf("mb: %d %d processed\n", mb_y, mb_x); |
| 2967 | 1457 ptr = s->picture.data[c] + |
| 1458 (((s->linesize[c] * (v * mb_y + y) * 8) + | |
| 2258 | 1459 (h * mb_x + x) * 8) >> s->avctx->lowres); |
| 1359 | 1460 if (s->interlaced && s->bottom_field) |
| 1461 ptr += s->linesize[c] >> 1; | |
| 1994 | 1462 //av_log(NULL, AV_LOG_DEBUG, "%d %d %d %d %d %d %d %d \n", mb_x, mb_y, x, y, c, s->bottom_field, (v * mb_y + y) * 8, (h * mb_x + x) * 8); |
| 1359 | 1463 s->idct_put(ptr, s->linesize[c], s->block); |
| 1464 if (++x == h) { | |
| 1465 x = 0; | |
| 1466 y++; | |
| 1467 } | |
| 1468 } | |
| 1469 } | |
| 1470 /* (< 1350) buggy workaround for Spectralfan.mov, should be fixed */ | |
| 1471 if (s->restart_interval && (s->restart_interval < 1350) && | |
| 1472 !--s->restart_count) { | |
| 1473 align_get_bits(&s->gb); | |
| 1474 skip_bits(&s->gb, 16); /* skip RSTn */ | |
| 1475 for (i=0; i<nb_components; i++) /* reset dc */ | |
| 1476 s->last_dc[i] = 1024; | |
| 1477 } | |
| 1478 } | |
| 1479 } | |
| 1480 return 0; | |
| 1481 } | |
| 1482 | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1483 static int mjpeg_decode_sos(MJpegDecodeContext *s) |
| 23 | 1484 { |
| 1455 | 1485 int len, nb_components, i, h, v, predictor, point_transform; |
| 1359 | 1486 int vmax, hmax, index, id; |
| 1307 | 1487 const int block_size= s->lossless ? 1 : 8; |
| 2976 | 1488 int ilv; |
| 1307 | 1489 |
| 23 | 1490 /* XXX: verify len field validity */ |
| 1491 len = get_bits(&s->gb, 16); | |
| 1492 nb_components = get_bits(&s->gb, 8); | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1493 if (len != 6+2*nb_components) |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1494 { |
| 2979 | 1495 dprintf("decode_sos: invalid len (%d)\n", len); |
| 1496 return -1; | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1497 } |
| 23 | 1498 /* XXX: only interleaved scan accepted */ |
|
1740
0c686b4cd576
grayscale mjpeg decoding support based upon a patch by (Leon Bottou (leonb))
michael
parents:
1679
diff
changeset
|
1499 if (nb_components != s->nb_components) |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1500 { |
| 2979 | 1501 dprintf("decode_sos: components(%d) mismatch\n", nb_components); |
| 23 | 1502 return -1; |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1503 } |
| 23 | 1504 vmax = 0; |
| 1505 hmax = 0; | |
| 1506 for(i=0;i<nb_components;i++) { | |
| 26 | 1507 id = get_bits(&s->gb, 8) - 1; |
| 2979 | 1508 dprintf("component: %d\n", id); |
| 26 | 1509 /* find component index */ |
| 1510 for(index=0;index<s->nb_components;index++) | |
| 1511 if (id == s->component_id[index]) | |
| 1512 break; | |
| 1513 if (index == s->nb_components) | |
| 2979 | 1514 { |
| 1515 dprintf("decode_sos: index(%d) out of components\n", index); | |
| 23 | 1516 return -1; |
| 2979 | 1517 } |
| 26 | 1518 |
| 1359 | 1519 s->comp_index[i] = index; |
| 1310 | 1520 |
| 1359 | 1521 s->nb_blocks[i] = s->h_count[index] * s->v_count[index]; |
| 1522 s->h_scount[i] = s->h_count[index]; | |
| 1523 s->v_scount[i] = s->v_count[index]; | |
|
28
b611fafddf9e
added 422P and 444P support - fixed block parsing error
glantau
parents:
26
diff
changeset
|
1524 |
| 1359 | 1525 s->dc_index[i] = get_bits(&s->gb, 4); |
| 1526 s->ac_index[i] = get_bits(&s->gb, 4); | |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1527 |
| 2979 | 1528 if (s->dc_index[i] < 0 || s->ac_index[i] < 0 || |
| 1529 s->dc_index[i] >= 4 || s->ac_index[i] >= 4) | |
| 1530 goto out_of_range; | |
| 1359 | 1531 #if 0 //buggy |
| 2979 | 1532 switch(s->start_code) |
| 1533 { | |
| 1534 case SOF0: | |
| 1535 if (dc_index[i] > 1 || ac_index[i] > 1) | |
| 1536 goto out_of_range; | |
| 1537 break; | |
| 1538 case SOF1: | |
| 1539 case SOF2: | |
| 1540 if (dc_index[i] > 3 || ac_index[i] > 3) | |
| 1541 goto out_of_range; | |
| 1542 break; | |
| 1543 case SOF3: | |
| 1544 if (dc_index[i] > 3 || ac_index[i] != 0) | |
| 1545 goto out_of_range; | |
| 1546 break; | |
| 1547 } | |
| 1359 | 1548 #endif |
| 23 | 1549 } |
| 1310 | 1550 |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1551 predictor= get_bits(&s->gb, 8); /* JPEG Ss / lossless JPEG predictor /JPEG-LS NEAR */ |
| 2976 | 1552 ilv= get_bits(&s->gb, 8); /* JPEG Se / JPEG-LS ILV */ |
| 1307 | 1553 skip_bits(&s->gb, 4); /* Ah */ |
| 1554 point_transform= get_bits(&s->gb, 4); /* Al */ | |
| 23 | 1555 |
| 2967 | 1556 for(i=0;i<nb_components;i++) |
| 23 | 1557 s->last_dc[i] = 1024; |
| 1558 | |
| 1559 if (nb_components > 1) { | |
| 1560 /* interleaved stream */ | |
| 1359 | 1561 s->mb_width = (s->width + s->h_max * block_size - 1) / (s->h_max * block_size); |
| 1562 s->mb_height = (s->height + s->v_max * block_size - 1) / (s->v_max * block_size); | |
| 23 | 1563 } else { |
| 1359 | 1564 h = s->h_max / s->h_scount[s->comp_index[0]]; |
| 1565 v = s->v_max / s->v_scount[s->comp_index[0]]; | |
| 1566 s->mb_width = (s->width + h * block_size - 1) / (h * block_size); | |
| 1567 s->mb_height = (s->height + v * block_size - 1) / (v * block_size); | |
| 1568 s->nb_blocks[0] = 1; | |
| 1569 s->h_scount[0] = 1; | |
| 1570 s->v_scount[0] = 1; | |
| 23 | 1571 } |
| 1307 | 1572 |
| 1310 | 1573 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1574 av_log(s->avctx, AV_LOG_DEBUG, "%s %s p:%d >>:%d ilv:%d bits:%d %s\n", s->lossless ? "lossless" : "sequencial DCT", s->rgb ? "RGB" : "", |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1575 predictor, point_transform, ilv, s->bits, |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1576 s->pegasus_rct ? "PRCT" : (s->rct ? "RCT" : "")); |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1577 |
| 2967 | 1578 |
|
2333
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
1579 /* mjpeg-b can have padding bytes between sos and image data, skip them */ |
|
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
1580 for (i = s->mjpb_skiptosod; i > 0; i--) |
|
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
1581 skip_bits(&s->gb, 8); |
|
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
1582 |
| 1307 | 1583 if(s->lossless){ |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1584 if(s->ls){ |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1585 // for(){ |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1586 }else{ |
| 1359 | 1587 if(s->rgb){ |
| 1588 if(ljpeg_decode_rgb_scan(s, predictor, point_transform) < 0) | |
| 1589 return -1; | |
| 1590 }else{ | |
| 1591 if(ljpeg_decode_yuv_scan(s, predictor, point_transform) < 0) | |
| 1592 return -1; | |
| 1307 | 1593 } |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1594 } |
| 1307 | 1595 }else{ |
| 1359 | 1596 if(mjpeg_decode_scan(s) < 0) |
| 1597 return -1; | |
| 23 | 1598 } |
|
44
92d51f683931
added forgotten emms() - fix various segmentation faults when using mjpeg
glantau
parents:
37
diff
changeset
|
1599 emms_c(); |
| 1359 | 1600 return 0; |
|
349
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1601 out_of_range: |
|
34f6c77ff01a
Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents:
344
diff
changeset
|
1602 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
|
1603 return -1; |
| 23 | 1604 } |
| 1605 | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1606 static int mjpeg_decode_dri(MJpegDecodeContext *s) |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1607 { |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1608 if (get_bits(&s->gb, 16) != 4) |
| 2979 | 1609 return -1; |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1610 s->restart_interval = get_bits(&s->gb, 16); |
|
2802
4db6127e20b8
reset restart_count when restart_interval is set and fill the
reimar
parents:
2799
diff
changeset
|
1611 s->restart_count = 0; |
|
507
b5b91e89b88c
* turned into debug message - it's annoying when watching mjpeg files
kabi
parents:
477
diff
changeset
|
1612 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
|
1613 |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1614 return 0; |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1615 } |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1616 |
|
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
|
1617 static int mjpeg_decode_app(MJpegDecodeContext *s) |
| 354 | 1618 { |
| 1619 int len, id; | |
| 1620 | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1621 len = get_bits(&s->gb, 16); |
| 354 | 1622 if (len < 5) |
| 2979 | 1623 return -1; |
| 2789 | 1624 if(8*len + get_bits_count(&s->gb) > s->gb.size_in_bits) |
| 1625 return -1; | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1626 |
| 811 | 1627 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
| 1628 id = be2me_32(id); | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1629 len -= 6; |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1630 |
| 1310 | 1631 if(s->avctx->debug & FF_DEBUG_STARTCODE){ |
| 2967 | 1632 av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id); |
| 1310 | 1633 } |
| 2967 | 1634 |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1635 /* buggy AVID, it puts EOI only at every 10th frame */ |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1636 /* also this fourcc is used by non-avid files too, it holds some |
|
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1637 informations, but it's always present in AVID creates files */ |
|
786
62faac9a4c3d
FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents:
780
diff
changeset
|
1638 if (id == ff_get_fourcc("AVI1")) |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1639 { |
| 2979 | 1640 /* structure: |
| 1641 4bytes AVI1 | |
| 1642 1bytes polarity | |
| 1643 1bytes always zero | |
| 1644 4bytes field_size | |
| 1645 4bytes field_size_less_padding | |
| 1646 */ | |
| 1647 s->buggy_avid = 1; | |
| 1648 // if (s->first_picture) | |
| 1649 // printf("mjpeg: workarounding buggy AVID\n"); | |
| 1650 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
|
1651 #if 0 |
| 2979 | 1652 skip_bits(&s->gb, 8); |
| 1653 skip_bits(&s->gb, 32); | |
| 1654 skip_bits(&s->gb, 32); | |
| 1655 len -= 10; | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1656 #endif |
| 2979 | 1657 // if (s->interlace_polarity) |
| 1658 // printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity); | |
| 1659 goto out; | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1660 } |
| 2967 | 1661 |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1662 // len -= 2; |
| 2967 | 1663 |
|
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
|
1664 if (id == ff_get_fourcc("JFIF")) |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1665 { |
| 2979 | 1666 int t_w, t_h, v1, v2; |
| 1667 skip_bits(&s->gb, 8); /* the trailing zero-byte */ | |
| 1668 v1= get_bits(&s->gb, 8); | |
| 1911 | 1669 v2= get_bits(&s->gb, 8); |
| 1548 | 1670 skip_bits(&s->gb, 8); |
| 903 | 1671 |
| 1548 | 1672 s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 16); |
| 1673 s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 16); | |
| 935 | 1674 |
| 1911 | 1675 if (s->avctx->debug & FF_DEBUG_PICT_INFO) |
| 1676 av_log(s->avctx, AV_LOG_INFO, "mjpeg: JFIF header found (version: %x.%x) SAR=%d/%d\n", | |
| 1677 v1, v2, | |
| 1678 s->avctx->sample_aspect_ratio.num, | |
| 1679 s->avctx->sample_aspect_ratio.den | |
| 1680 ); | |
| 1681 | |
| 2979 | 1682 t_w = get_bits(&s->gb, 8); |
| 1683 t_h = get_bits(&s->gb, 8); | |
| 1684 if (t_w && t_h) | |
| 1685 { | |
| 1686 /* skip thumbnail */ | |
| 1687 if (len-10-(t_w*t_h*3) > 0) | |
| 1688 len -= t_w*t_h*3; | |
| 1689 } | |
| 1690 len -= 10; | |
| 1691 goto out; | |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1692 } |
| 2967 | 1693 |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1694 if (id == ff_get_fourcc("Adob") && (get_bits(&s->gb, 8) == 'e')) |
|
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1695 { |
|
1906
caee9c21b0b1
always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents:
1892
diff
changeset
|
1696 if (s->avctx->debug & FF_DEBUG_PICT_INFO) |
|
caee9c21b0b1
always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents:
1892
diff
changeset
|
1697 av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found\n"); |
| 2979 | 1698 skip_bits(&s->gb, 16); /* version */ |
| 1699 skip_bits(&s->gb, 16); /* flags0 */ | |
| 1700 skip_bits(&s->gb, 16); /* flags1 */ | |
| 1701 skip_bits(&s->gb, 8); /* transform */ | |
| 1702 len -= 7; | |
| 1703 goto out; | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1704 } |
| 1310 | 1705 |
| 1706 if (id == ff_get_fourcc("LJIF")){ | |
|
1906
caee9c21b0b1
always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents:
1892
diff
changeset
|
1707 if (s->avctx->debug & FF_DEBUG_PICT_INFO) |
|
caee9c21b0b1
always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents:
1892
diff
changeset
|
1708 av_log(s->avctx, AV_LOG_INFO, "Pegasus lossless jpeg header found\n"); |
| 2979 | 1709 skip_bits(&s->gb, 16); /* version ? */ |
| 1710 skip_bits(&s->gb, 16); /* unknwon always 0? */ | |
| 1711 skip_bits(&s->gb, 16); /* unknwon always 0? */ | |
| 1712 skip_bits(&s->gb, 16); /* unknwon always 0? */ | |
| 1310 | 1713 switch( get_bits(&s->gb, 8)){ |
| 1714 case 1: | |
| 1715 s->rgb= 1; | |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
1716 s->pegasus_rct=0; |
| 1310 | 1717 break; |
| 1718 case 2: | |
| 1719 s->rgb= 1; | |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
1720 s->pegasus_rct=1; |
| 1310 | 1721 break; |
| 1722 default: | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1560
diff
changeset
|
1723 av_log(s->avctx, AV_LOG_ERROR, "unknown colorspace\n"); |
| 1310 | 1724 } |
| 1725 len -= 9; | |
| 1726 goto out; | |
| 1727 } | |
| 2967 | 1728 |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1729 /* 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
|
1730 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
|
1731 { |
| 2979 | 1732 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
| 1733 id = be2me_32(id); | |
| 1734 len -= 4; | |
| 1735 if (id == ff_get_fourcc("mjpg")) /* Apple MJPEG-A */ | |
| 1736 { | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1737 #if 0 |
| 2979 | 1738 skip_bits(&s->gb, 32); /* field size */ |
| 1739 skip_bits(&s->gb, 32); /* pad field size */ | |
| 1740 skip_bits(&s->gb, 32); /* next off */ | |
| 1741 skip_bits(&s->gb, 32); /* quant off */ | |
| 1742 skip_bits(&s->gb, 32); /* huff off */ | |
| 1743 skip_bits(&s->gb, 32); /* image off */ | |
| 1744 skip_bits(&s->gb, 32); /* scan off */ | |
| 1745 skip_bits(&s->gb, 32); /* data off */ | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1746 #endif |
|
1906
caee9c21b0b1
always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents:
1892
diff
changeset
|
1747 if (s->avctx->debug & FF_DEBUG_PICT_INFO) |
| 2979 | 1748 av_log(s->avctx, AV_LOG_INFO, "mjpeg: Apple MJPEG-A header found\n"); |
| 1749 } | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1750 } |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1751 |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1752 out: |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1753 /* slow but needed for extreme adobe jpegs */ |
|
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1754 if (len < 0) |
| 2979 | 1755 av_log(s->avctx, AV_LOG_ERROR, "mjpeg: error, decode_app parser read over the end\n"); |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1756 while(--len > 0) |
| 2979 | 1757 skip_bits(&s->gb, 8); |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1758 |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1759 return 0; |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1760 } |
|
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1761 |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1762 static int mjpeg_decode_com(MJpegDecodeContext *s) |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1763 { |
| 1322 | 1764 int len = get_bits(&s->gb, 16); |
| 2798 | 1765 if (len >= 2 && 8*len - 16 + get_bits_count(&s->gb) <= s->gb.size_in_bits) { |
| 2979 | 1766 uint8_t *cbuf = av_malloc(len - 1); |
| 1767 if (cbuf) { | |
| 1768 int i; | |
| 1769 for (i = 0; i < len - 2; i++) | |
| 1770 cbuf[i] = get_bits(&s->gb, 8); | |
| 1771 if (i > 0 && cbuf[i-1] == '\n') | |
| 1772 cbuf[i-1] = 0; | |
| 1773 else | |
| 1774 cbuf[i] = 0; | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1775 |
| 1911 | 1776 if(s->avctx->debug & FF_DEBUG_PICT_INFO) |
| 1777 av_log(s->avctx, AV_LOG_INFO, "mjpeg comment: '%s'\n", cbuf); | |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
1778 |
| 2979 | 1779 /* buggy avid, it puts EOI only at every 10th frame */ |
| 1780 if (!strcmp(cbuf, "AVID")) | |
| 1781 { | |
| 1782 s->buggy_avid = 1; | |
| 1783 // if (s->first_picture) | |
| 1784 // printf("mjpeg: workarounding buggy AVID\n"); | |
| 1785 } | |
| 2442 | 1786 else if(!strcmp(cbuf, "CS=ITU601")){ |
| 1787 s->cs_itu601= 1; | |
| 1788 } | |
| 1061 | 1789 |
| 2979 | 1790 av_free(cbuf); |
| 1791 } | |
| 354 | 1792 } |
| 1793 | |
| 1794 return 0; | |
| 1795 } | |
| 1796 | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1797 #if 0 |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1798 static int valid_marker_list[] = |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1799 { |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1800 /* 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
|
1801 /* 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
|
1802 /* 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
|
1803 /* 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
|
1804 /* 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
|
1805 /* 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
|
1806 /* 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
|
1807 /* 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
|
1808 /* 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
|
1809 /* 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
|
1810 /* 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
|
1811 /* 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
|
1812 /* 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
|
1813 /* 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
|
1814 /* 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
|
1815 /* 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
|
1816 /* 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
|
1817 } |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1818 #endif |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1819 |
| 23 | 1820 /* return the 8 bit start code value and update the search |
| 1821 state. Return -1 if no start code found */ | |
| 1064 | 1822 static int find_marker(uint8_t **pbuf_ptr, uint8_t *buf_end) |
| 23 | 1823 { |
| 1064 | 1824 uint8_t *buf_ptr; |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1825 unsigned int v, v2; |
| 23 | 1826 int val; |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1827 #ifdef DEBUG |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1828 int skipped=0; |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1829 #endif |
| 23 | 1830 |
| 1831 buf_ptr = *pbuf_ptr; | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1832 while (buf_ptr < buf_end) { |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1833 v = *buf_ptr++; |
| 2979 | 1834 v2 = *buf_ptr; |
| 1619 | 1835 if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe) && buf_ptr < buf_end) { |
| 2979 | 1836 val = *buf_ptr++; |
| 1837 goto found; | |
| 23 | 1838 } |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1839 #ifdef DEBUG |
| 2979 | 1840 skipped++; |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1841 #endif |
| 23 | 1842 } |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1843 val = -1; |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1844 found: |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1845 #ifdef DEBUG |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1846 dprintf("find_marker skipped %d bytes\n", skipped); |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1847 #endif |
| 23 | 1848 *pbuf_ptr = buf_ptr; |
| 1849 return val; | |
| 1850 } | |
| 1851 | |
| 2967 | 1852 static int mjpeg_decode_frame(AVCodecContext *avctx, |
| 23 | 1853 void *data, int *data_size, |
| 1064 | 1854 uint8_t *buf, int buf_size) |
| 23 | 1855 { |
| 1856 MJpegDecodeContext *s = avctx->priv_data; | |
| 1064 | 1857 uint8_t *buf_end, *buf_ptr; |
| 1519 | 1858 int start_code; |
| 1358 | 1859 AVFrame *picture = data; |
| 23 | 1860 |
| 1861 buf_ptr = buf; | |
| 1862 buf_end = buf + buf_size; | |
| 1863 while (buf_ptr < buf_end) { | |
| 1864 /* find start next marker */ | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1865 start_code = find_marker(&buf_ptr, buf_end); |
| 2979 | 1866 { |
| 1867 /* EOF */ | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1868 if (start_code < 0) { |
| 2979 | 1869 goto the_end; |
| 354 | 1870 } else { |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1871 dprintf("marker=%x avail_size_in_buf=%d\n", start_code, buf_end - buf_ptr); |
| 2967 | 1872 |
| 2979 | 1873 if ((buf_end - buf_ptr) > s->buffer_size) |
| 1874 { | |
| 1875 av_free(s->buffer); | |
| 1876 s->buffer_size = buf_end-buf_ptr; | |
|
2799
924c7e66ced8
dont pre allocate uselessly large buffer and dont ignore FF_INPUT_BUFFER_PADDING_SIZE
michael
parents:
2798
diff
changeset
|
1877 s->buffer = av_malloc(s->buffer_size + FF_INPUT_BUFFER_PADDING_SIZE); |
| 2979 | 1878 dprintf("buffer too small, expanding to %d bytes\n", |
| 1879 s->buffer_size); | |
| 1880 } | |
| 2967 | 1881 |
| 2979 | 1882 /* unescape buffer of SOS */ |
| 1883 if (start_code == SOS) | |
| 1884 { | |
| 1885 uint8_t *src = buf_ptr; | |
| 1886 uint8_t *dst = s->buffer; | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1887 |
| 2979 | 1888 while (src<buf_end) |
| 1889 { | |
| 1890 uint8_t x = *(src++); | |
|
832
ff66fdb1d092
fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents:
811
diff
changeset
|
1891 |
| 2979 | 1892 *(dst++) = x; |
| 1893 if (x == 0xff) | |
| 1894 { | |
|
2360
0fcb4d572719
workaround apps which dont provided correctly padded streams
michael
parents:
2333
diff
changeset
|
1895 while(src<buf_end && x == 0xff) |
|
0fcb4d572719
workaround apps which dont provided correctly padded streams
michael
parents:
2333
diff
changeset
|
1896 x = *(src++); |
| 840 | 1897 |
| 2979 | 1898 if (x >= 0xd0 && x <= 0xd7) |
| 1899 *(dst++) = x; | |
| 1900 else if (x) | |
| 1901 break; | |
| 1902 } | |
| 1903 } | |
| 1904 init_get_bits(&s->gb, s->buffer, (dst - s->buffer)*8); | |
| 2967 | 1905 |
| 2979 | 1906 dprintf("escaping removed %d bytes\n", |
| 1907 (buf_end - buf_ptr) - (dst - s->buffer)); | |
| 1908 } | |
| 1909 else | |
| 1910 init_get_bits(&s->gb, buf_ptr, (buf_end - buf_ptr)*8); | |
| 2967 | 1911 |
| 2979 | 1912 s->start_code = start_code; |
| 1310 | 1913 if(s->avctx->debug & FF_DEBUG_STARTCODE){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1560
diff
changeset
|
1914 av_log(s->avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code); |
| 1310 | 1915 } |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1916 |
| 2979 | 1917 /* process markers */ |
| 1918 if (start_code >= 0xd0 && start_code <= 0xd7) { | |
| 1919 dprintf("restart marker: %d\n", start_code&0x0f); | |
| 1920 /* APP fields */ | |
| 1921 } else if (start_code >= APP0 && start_code <= APP15) { | |
| 1922 mjpeg_decode_app(s); | |
| 1923 /* Comment */ | |
| 1924 } else if (start_code == COM){ | |
| 1925 mjpeg_decode_com(s); | |
| 1926 } | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1927 |
| 23 | 1928 switch(start_code) { |
| 1929 case SOI: | |
| 2979 | 1930 s->restart_interval = 0; |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1931 reset_ls_coding_parameters(s, 1); |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1932 |
| 2979 | 1933 s->restart_count = 0; |
| 23 | 1934 /* nothing to do on SOI */ |
| 1935 break; | |
| 1936 case DQT: | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1937 mjpeg_decode_dqt(s); |
| 23 | 1938 break; |
| 1939 case DHT: | |
| 1351 | 1940 if(mjpeg_decode_dht(s) < 0){ |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1560
diff
changeset
|
1941 av_log(s->avctx, AV_LOG_ERROR, "huffman table decode error\n"); |
| 1351 | 1942 return -1; |
| 1943 } | |
| 23 | 1944 break; |
| 1945 case SOF0: | |
| 1307 | 1946 s->lossless=0; |
| 2967 | 1947 if (mjpeg_decode_sof(s) < 0) |
| 2979 | 1948 return -1; |
| 1307 | 1949 break; |
| 1950 case SOF3: | |
| 1951 s->lossless=1; | |
| 2967 | 1952 if (mjpeg_decode_sof(s) < 0) |
| 2979 | 1953 return -1; |
| 23 | 1954 break; |
|
2970
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1955 case SOF48: |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1956 s->lossless=1; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1957 s->ls=1; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1958 if (mjpeg_decode_sof(s) < 0) |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1959 return -1; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1960 break; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1961 case LSE: |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1962 if (decode_lse(s) < 0) |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1963 return -1; |
|
583b6ac45c07
unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents:
2967
diff
changeset
|
1964 break; |
| 2979 | 1965 case EOI: |
| 1966 if ((s->buggy_avid && !s->interlaced) || s->restart_interval) | |
| 1358 | 1967 break; |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1968 eoi_parser: |
| 2979 | 1969 { |
| 53 | 1970 if (s->interlaced) { |
| 1971 s->bottom_field ^= 1; | |
| 1972 /* if not bottom field, do not output image yet */ | |
| 1973 if (s->bottom_field) | |
|
540
4cee7ce37e10
don't exit decoder after decoding first field -> fixes angels.avi interlacing
arpi_esp
parents:
527
diff
changeset
|
1974 goto not_the_end; |
| 53 | 1975 } |
| 1513 | 1976 *picture = s->picture; |
| 1358 | 1977 *data_size = sizeof(AVFrame); |
| 1978 | |
| 1979 if(!s->lossless){ | |
| 2967 | 1980 picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]); |
| 1358 | 1981 picture->qstride= 0; |
| 1982 picture->qscale_table= s->qscale_table; | |
| 1983 memset(picture->qscale_table, picture->quality, (s->width+15)/16); | |
| 1984 if(avctx->debug & FF_DEBUG_QP) | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1560
diff
changeset
|
1985 av_log(s->avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality); |
|
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1455
diff
changeset
|
1986 picture->quality*= FF_QP2LAMBDA; |
| 1358 | 1987 } |
| 2967 | 1988 |
| 23 | 1989 goto the_end; |
| 1990 } | |
| 2979 | 1991 break; |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1992 case SOS: |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
1993 mjpeg_decode_sos(s); |
| 2979 | 1994 /* buggy avid puts EOI every 10-20th frame */ |
| 1995 /* if restart period is over process EOI */ | |
| 1996 if ((s->buggy_avid && !s->interlaced) || s->restart_interval) | |
| 1997 goto eoi_parser; | |
| 1998 break; | |
| 1999 case DRI: | |
| 2000 mjpeg_decode_dri(s); | |
| 23 | 2001 break; |
| 2979 | 2002 case SOF1: |
| 2003 case SOF2: | |
| 2004 case SOF5: | |
| 2005 case SOF6: | |
| 2006 case SOF7: | |
| 2007 case SOF9: | |
| 2008 case SOF10: | |
| 2009 case SOF11: | |
| 2010 case SOF13: | |
| 2011 case SOF14: | |
| 2012 case SOF15: | |
| 2013 case JPG: | |
| 2014 av_log(s->avctx, AV_LOG_ERROR, "mjpeg: unsupported coding type (%x)\n", start_code); | |
| 2015 break; | |
| 2016 // default: | |
| 2017 // printf("mjpeg: unsupported marker (%x)\n", start_code); | |
| 2018 // break; | |
| 23 | 2019 } |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
2020 |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
2021 not_the_end: |
| 2979 | 2022 /* eof process start code */ |
| 2023 buf_ptr += (get_bits_count(&s->gb)+7)/8; | |
| 2024 dprintf("marker parser used %d bytes (%d bits)\n", | |
| 2025 (get_bits_count(&s->gb)+7)/8, get_bits_count(&s->gb)); | |
| 23 | 2026 } |
| 2027 } | |
| 2028 } | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
2029 the_end: |
|
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
2030 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
|
2031 // return buf_end - buf_ptr; |
| 23 | 2032 return buf_ptr - buf; |
| 2033 } | |
| 2034 | |
| 2967 | 2035 static int mjpegb_decode_frame(AVCodecContext *avctx, |
| 881 | 2036 void *data, int *data_size, |
| 1064 | 2037 uint8_t *buf, int buf_size) |
| 881 | 2038 { |
| 2039 MJpegDecodeContext *s = avctx->priv_data; | |
| 1064 | 2040 uint8_t *buf_end, *buf_ptr; |
| 1358 | 2041 AVFrame *picture = data; |
| 881 | 2042 GetBitContext hgb; /* for the header */ |
| 2043 uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs; | |
|
2333
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
2044 uint32_t field_size, sod_offs; |
| 881 | 2045 |
| 2046 buf_ptr = buf; | |
| 2047 buf_end = buf + buf_size; | |
| 2967 | 2048 |
| 881 | 2049 read_header: |
| 2050 /* reset on every SOI */ | |
| 2051 s->restart_interval = 0; | |
|
2802
4db6127e20b8
reset restart_count when restart_interval is set and fill the
reimar
parents:
2799
diff
changeset
|
2052 s->restart_count = 0; |
|
2333
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
2053 s->mjpb_skiptosod = 0; |
| 881 | 2054 |
|
1025
1f9afd8b9131
GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents:
949
diff
changeset
|
2055 init_get_bits(&hgb, buf_ptr, /*buf_size*/(buf_end - buf_ptr)*8); |
| 881 | 2056 |
| 2057 skip_bits(&hgb, 32); /* reserved zeros */ | |
| 2967 | 2058 |
| 2173 | 2059 if (get_bits_long(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg"))) |
| 881 | 2060 { |
| 2979 | 2061 dprintf("not mjpeg-b (bad fourcc)\n"); |
| 2062 return 0; | |
| 881 | 2063 } |
| 2064 | |
| 2173 | 2065 field_size = get_bits_long(&hgb, 32); /* field size */ |
| 881 | 2066 dprintf("field size: 0x%x\n", field_size); |
| 2067 skip_bits(&hgb, 32); /* padded field size */ | |
| 2173 | 2068 second_field_offs = get_bits_long(&hgb, 32); |
| 881 | 2069 dprintf("second field offs: 0x%x\n", second_field_offs); |
| 2070 if (second_field_offs) | |
| 2979 | 2071 s->interlaced = 1; |
| 881 | 2072 |
| 2173 | 2073 dqt_offs = get_bits_long(&hgb, 32); |
| 881 | 2074 dprintf("dqt offs: 0x%x\n", dqt_offs); |
| 2075 if (dqt_offs) | |
| 2076 { | |
| 2979 | 2077 init_get_bits(&s->gb, buf+dqt_offs, (buf_end - (buf+dqt_offs))*8); |
| 2078 s->start_code = DQT; | |
| 2079 mjpeg_decode_dqt(s); | |
| 881 | 2080 } |
| 2967 | 2081 |
| 2173 | 2082 dht_offs = get_bits_long(&hgb, 32); |
| 881 | 2083 dprintf("dht offs: 0x%x\n", dht_offs); |
| 2084 if (dht_offs) | |
| 2085 { | |
| 2979 | 2086 init_get_bits(&s->gb, buf+dht_offs, (buf_end - (buf+dht_offs))*8); |
| 2087 s->start_code = DHT; | |
| 2088 mjpeg_decode_dht(s); | |
| 881 | 2089 } |
| 2090 | |
| 2173 | 2091 sof_offs = get_bits_long(&hgb, 32); |
| 881 | 2092 dprintf("sof offs: 0x%x\n", sof_offs); |
| 2093 if (sof_offs) | |
| 2094 { | |
| 2979 | 2095 init_get_bits(&s->gb, buf+sof_offs, (buf_end - (buf+sof_offs))*8); |
| 2096 s->start_code = SOF0; | |
| 2097 if (mjpeg_decode_sof(s) < 0) | |
| 2098 return -1; | |
| 881 | 2099 } |
| 2100 | |
| 2173 | 2101 sos_offs = get_bits_long(&hgb, 32); |
| 881 | 2102 dprintf("sos offs: 0x%x\n", sos_offs); |
|
2333
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
2103 sod_offs = get_bits_long(&hgb, 32); |
|
816185a9594a
Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents:
2319
diff
changeset
|
2104 dprintf("sod offs: 0x%x\n", sod_offs); |
| 881 | 2105 if (sos_offs) |
| 2106 { | |
| 2979 | 2107 // init_get_bits(&s->gb, buf+sos_offs, (buf_end - (buf+sos_offs))*8); |
| 2108 init_get_bits(&s->gb, buf+sos_offs, field_size*8); | |
| 2109 s->mjpb_skiptosod = (sod_offs - sos_offs - show_bits(&s->gb, 16)); | |
| 2110 s->start_code = SOS; | |
| 2111 mjpeg_decode_sos(s); | |
| 881 | 2112 } |
| 2113 | |
| 2114 if (s->interlaced) { | |
| 2115 s->bottom_field ^= 1; | |
| 2116 /* if not bottom field, do not output image yet */ | |
| 2117 if (s->bottom_field && second_field_offs) | |
| 2979 | 2118 { |
| 2119 buf_ptr = buf + second_field_offs; | |
| 2120 second_field_offs = 0; | |
| 2121 goto read_header; | |
| 2122 } | |
| 881 | 2123 } |
| 2124 | |
| 1358 | 2125 //XXX FIXME factorize, this looks very similar to the EOI code |
| 1513 | 2126 |
| 2127 *picture= s->picture; | |
| 1358 | 2128 *data_size = sizeof(AVFrame); |
| 2967 | 2129 |
| 1358 | 2130 if(!s->lossless){ |
| 2967 | 2131 picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]); |
| 1358 | 2132 picture->qstride= 0; |
| 2133 picture->qscale_table= s->qscale_table; | |
| 2134 memset(picture->qscale_table, picture->quality, (s->width+15)/16); | |
| 2135 if(avctx->debug & FF_DEBUG_QP) | |
|
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1560
diff
changeset
|
2136 av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality); |
|
1505
010f76d07a27
use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents:
1455
diff
changeset
|
2137 picture->quality*= FF_QP2LAMBDA; |
| 1358 | 2138 } |
| 881 | 2139 |
| 2140 return buf_ptr - buf; | |
| 2141 } | |
| 2142 | |
| 1519 | 2143 #include "sp5x.h" |
| 2144 | |
| 2967 | 2145 static int sp5x_decode_frame(AVCodecContext *avctx, |
| 1519 | 2146 void *data, int *data_size, |
| 2147 uint8_t *buf, int buf_size) | |
| 2148 { | |
| 2149 #if 0 | |
| 2150 MJpegDecodeContext *s = avctx->priv_data; | |
| 2151 #endif | |
| 2152 const int qscale = 5; | |
| 2153 uint8_t *buf_ptr, *buf_end, *recoded; | |
| 2154 int i = 0, j = 0; | |
| 2155 | |
| 2156 if (!avctx->width || !avctx->height) | |
| 2979 | 2157 return -1; |
| 1519 | 2158 |
| 2159 buf_ptr = buf; | |
| 2160 buf_end = buf + buf_size; | |
| 2161 | |
| 2162 #if 1 | |
| 2163 recoded = av_mallocz(buf_size + 1024); | |
| 2164 if (!recoded) | |
| 2979 | 2165 return -1; |
| 1519 | 2166 |
| 2167 /* SOI */ | |
| 2168 recoded[j++] = 0xFF; | |
| 2169 recoded[j++] = 0xD8; | |
| 2170 | |
| 2171 memcpy(recoded+j, &sp5x_data_dqt[0], sizeof(sp5x_data_dqt)); | |
| 2172 memcpy(recoded+j+5, &sp5x_quant_table[qscale * 2], 64); | |
| 2173 memcpy(recoded+j+70, &sp5x_quant_table[(qscale * 2) + 1], 64); | |
| 2174 j += sizeof(sp5x_data_dqt); | |
| 2175 | |
| 2176 memcpy(recoded+j, &sp5x_data_dht[0], sizeof(sp5x_data_dht)); | |
| 2177 j += sizeof(sp5x_data_dht); | |
| 2178 | |
| 2179 memcpy(recoded+j, &sp5x_data_sof[0], sizeof(sp5x_data_sof)); | |
| 2270 | 2180 recoded[j+5] = (avctx->coded_height >> 8) & 0xFF; |
| 2181 recoded[j+6] = avctx->coded_height & 0xFF; | |
| 2182 recoded[j+7] = (avctx->coded_width >> 8) & 0xFF; | |
| 2183 recoded[j+8] = avctx->coded_width & 0xFF; | |
| 1519 | 2184 j += sizeof(sp5x_data_sof); |
| 2185 | |
| 2186 memcpy(recoded+j, &sp5x_data_sos[0], sizeof(sp5x_data_sos)); | |
| 2187 j += sizeof(sp5x_data_sos); | |
| 2188 | |
| 1548 | 2189 for (i = 14; i < buf_size && j < buf_size+1024-2; i++) |
| 1519 | 2190 { |
| 2979 | 2191 recoded[j++] = buf[i]; |
| 2192 if (buf[i] == 0xff) | |
| 2193 recoded[j++] = 0; | |
| 1519 | 2194 } |
| 2195 | |
| 2196 /* EOI */ | |
| 2197 recoded[j++] = 0xFF; | |
| 2198 recoded[j++] = 0xD9; | |
| 2199 | |
| 2200 i = mjpeg_decode_frame(avctx, data, data_size, recoded, j); | |
| 2201 | |
| 2202 av_free(recoded); | |
| 2203 | |
| 2204 #else | |
| 2205 /* SOF */ | |
| 2206 s->bits = 8; | |
| 2270 | 2207 s->width = avctx->coded_width; |
| 2208 s->height = avctx->coded_height; | |
| 1519 | 2209 s->nb_components = 3; |
| 2210 s->component_id[0] = 0; | |
| 2211 s->h_count[0] = 2; | |
| 2212 s->v_count[0] = 2; | |
| 2213 s->quant_index[0] = 0; | |
| 2214 s->component_id[1] = 1; | |
| 2215 s->h_count[1] = 1; | |
| 2216 s->v_count[1] = 1; | |
| 2217 s->quant_index[1] = 1; | |
| 2218 s->component_id[2] = 2; | |
| 2219 s->h_count[2] = 1; | |
| 2220 s->v_count[2] = 1; | |
| 2221 s->quant_index[2] = 1; | |
| 2222 s->h_max = 2; | |
| 2223 s->v_max = 2; | |
| 2967 | 2224 |
| 1519 | 2225 s->qscale_table = av_mallocz((s->width+15)/16); |
| 2442 | 2226 avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV420P : PIX_FMT_YUVJ420; |
| 1519 | 2227 s->interlaced = 0; |
| 2967 | 2228 |
| 1519 | 2229 s->picture.reference = 0; |
| 2230 if (avctx->get_buffer(avctx, &s->picture) < 0) | |
| 2231 { | |
|
2846
40765c51a7a9
Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents:
2802
diff
changeset
|
2232 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); |
| 2979 | 2233 return -1; |
| 1519 | 2234 } |
| 2235 | |
| 2236 s->picture.pict_type = I_TYPE; | |
| 2237 s->picture.key_frame = 1; | |
| 2238 | |
| 2239 for (i = 0; i < 3; i++) | |
| 2979 | 2240 s->linesize[i] = s->picture.linesize[i] << s->interlaced; |
| 1519 | 2241 |
| 2242 /* DQT */ | |
| 2243 for (i = 0; i < 64; i++) | |
| 2244 { | |
| 2979 | 2245 j = s->scantable.permutated[i]; |
| 2246 s->quant_matrixes[0][j] = sp5x_quant_table[(qscale * 2) + i]; | |
| 1519 | 2247 } |
| 2248 s->qscale[0] = FFMAX( | |
| 2979 | 2249 s->quant_matrixes[0][s->scantable.permutated[1]], |
| 2250 s->quant_matrixes[0][s->scantable.permutated[8]]) >> 1; | |
| 1519 | 2251 |
| 2252 for (i = 0; i < 64; i++) | |
| 2253 { | |
| 2979 | 2254 j = s->scantable.permutated[i]; |
| 2255 s->quant_matrixes[1][j] = sp5x_quant_table[(qscale * 2) + 1 + i]; | |
| 1519 | 2256 } |
| 2257 s->qscale[1] = FFMAX( | |
| 2979 | 2258 s->quant_matrixes[1][s->scantable.permutated[1]], |
| 2259 s->quant_matrixes[1][s->scantable.permutated[8]]) >> 1; | |
| 1519 | 2260 |
| 2261 /* DHT */ | |
| 2262 | |
| 2263 /* SOS */ | |
| 2264 s->comp_index[0] = 0; | |
| 2265 s->nb_blocks[0] = s->h_count[0] * s->v_count[0]; | |
| 2266 s->h_scount[0] = s->h_count[0]; | |
| 2267 s->v_scount[0] = s->v_count[0]; | |
| 2268 s->dc_index[0] = 0; | |
| 2269 s->ac_index[0] = 0; | |
| 2270 | |
| 2271 s->comp_index[1] = 1; | |
| 2272 s->nb_blocks[1] = s->h_count[1] * s->v_count[1]; | |
| 2273 s->h_scount[1] = s->h_count[1]; | |
| 2274 s->v_scount[1] = s->v_count[1]; | |
| 2275 s->dc_index[1] = 1; | |
| 2276 s->ac_index[1] = 1; | |
| 2277 | |
| 2278 s->comp_index[2] = 2; | |
| 2279 s->nb_blocks[2] = s->h_count[2] * s->v_count[2]; | |
| 2280 s->h_scount[2] = s->h_count[2]; | |
| 2281 s->v_scount[2] = s->v_count[2]; | |
| 2282 s->dc_index[2] = 1; | |
| 2283 s->ac_index[2] = 1; | |
| 2967 | 2284 |
| 1519 | 2285 for (i = 0; i < 3; i++) |
| 2979 | 2286 s->last_dc[i] = 1024; |
| 1519 | 2287 |
| 2288 s->mb_width = (s->width * s->h_max * 8 -1) / (s->h_max * 8); | |
| 2289 s->mb_height = (s->height * s->v_max * 8 -1) / (s->v_max * 8); | |
| 2290 | |
| 1560 | 2291 init_get_bits(&s->gb, buf+14, (buf_size-14)*8); |
| 2967 | 2292 |
| 1519 | 2293 return mjpeg_decode_scan(s); |
| 2294 #endif | |
| 2295 | |
| 2296 return i; | |
| 2297 } | |
| 881 | 2298 |
| 23 | 2299 static int mjpeg_decode_end(AVCodecContext *avctx) |
| 2300 { | |
| 2301 MJpegDecodeContext *s = avctx->priv_data; | |
| 2302 int i, j; | |
| 2303 | |
|
775
e96776e1d2ae
reworked decode_frame marker searching, fixes many non-working samples
al3x
parents:
706
diff
changeset
|
2304 av_free(s->buffer); |
| 1358 | 2305 av_free(s->qscale_table); |
| 2967 | 2306 |
| 23 | 2307 for(i=0;i<2;i++) { |
| 2308 for(j=0;j<4;j++) | |
| 2309 free_vlc(&s->vlcs[i][j]); | |
| 2310 } | |
| 2311 return 0; | |
| 2312 } | |
| 2313 | |
| 2314 AVCodec mjpeg_decoder = { | |
| 2315 "mjpeg", | |
| 2316 CODEC_TYPE_VIDEO, | |
| 2317 CODEC_ID_MJPEG, | |
| 2318 sizeof(MJpegDecodeContext), | |
| 2319 mjpeg_decode_init, | |
| 2320 NULL, | |
| 2321 mjpeg_decode_end, | |
| 2322 mjpeg_decode_frame, | |
| 1513 | 2323 CODEC_CAP_DR1, |
|
369
c60869851bb4
added support for various app headers, and writin FFmpeg comment
al3x
parents:
357
diff
changeset
|
2324 NULL |
| 23 | 2325 }; |
| 881 | 2326 |
| 2327 AVCodec mjpegb_decoder = { | |
| 2328 "mjpegb", | |
| 2329 CODEC_TYPE_VIDEO, | |
| 2330 CODEC_ID_MJPEGB, | |
| 2331 sizeof(MJpegDecodeContext), | |
| 2332 mjpeg_decode_init, | |
| 2333 NULL, | |
| 2334 mjpeg_decode_end, | |
| 2335 mjpegb_decode_frame, | |
| 1513 | 2336 CODEC_CAP_DR1, |
| 881 | 2337 NULL |
| 2338 }; | |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2339 |
| 1519 | 2340 AVCodec sp5x_decoder = { |
| 2341 "sp5x", | |
| 2342 CODEC_TYPE_VIDEO, | |
| 2343 CODEC_ID_SP5X, | |
| 2344 sizeof(MJpegDecodeContext), | |
| 2345 mjpeg_decode_init, | |
| 2346 NULL, | |
| 2347 mjpeg_decode_end, | |
| 2348 sp5x_decode_frame, | |
| 2349 CODEC_CAP_DR1, | |
| 2350 NULL | |
| 2351 }; | |
| 2352 | |
| 1325 | 2353 #ifdef CONFIG_ENCODERS |
|
1315
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2354 AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless jpeg shouldnt need them |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2355 "ljpeg", |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2356 CODEC_TYPE_VIDEO, |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2357 CODEC_ID_LJPEG, |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2358 sizeof(MpegEncContext), |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2359 MPV_encode_init, |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2360 encode_picture_lossless, |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2361 MPV_encode_end, |
|
6696d3bf4ff2
lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents:
1312
diff
changeset
|
2362 }; |
| 1325 | 2363 #endif |
| 2319 | 2364 |
| 2365 AVCodecParser mjpeg_parser = { | |
| 2366 { CODEC_ID_MJPEG }, | |
| 2367 sizeof(ParseContext), | |
| 2368 NULL, | |
| 2369 jpeg_parse, | |
| 2370 ff_parse_close, | |
| 2371 }; | |
| 2372 |
