Mercurial > libavcodec.hg
annotate mjpegdec.c @ 9592:05661d19f6d2 libavcodec
Check whether extra bits block has enough data.
Patch by Laurent Aimar "f\145nr\151r >at< vide\157lan <dot> o\162g"
author | kostya |
---|---|
date | Sun, 03 May 2009 05:42:51 +0000 |
parents | 84932ac233a5 |
children | bd3e11b60ccd |
rev | line source |
---|---|
5020 | 1 /* |
2 * MJPEG decoder | |
8629
04423b2f6e0b
cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents:
8612
diff
changeset
|
3 * Copyright (c) 2000, 2001 Fabrice Bellard |
5020 | 4 * Copyright (c) 2003 Alex Beregszaszi |
5 * Copyright (c) 2003-2004 Michael Niedermayer | |
6 * | |
5214 | 7 * Support for external huffman table, various fixes (AVID workaround), |
8 * aspecting, new decode_frame mechanism and apple mjpeg-b support | |
9 * by Alex Beregszaszi | |
10 * | |
5020 | 11 * This file is part of FFmpeg. |
12 * | |
13 * FFmpeg is free software; you can redistribute it and/or | |
14 * modify it under the terms of the GNU Lesser General Public | |
15 * License as published by the Free Software Foundation; either | |
16 * version 2.1 of the License, or (at your option) any later version. | |
17 * | |
18 * FFmpeg is distributed in the hope that it will be useful, | |
19 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
21 * Lesser General Public License for more details. | |
22 * | |
23 * You should have received a copy of the GNU Lesser General Public | |
24 * License along with FFmpeg; if not, write to the Free Software | |
25 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
26 */ | |
27 | |
28 /** | |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8629
diff
changeset
|
29 * @file libavcodec/mjpegdec.c |
5020 | 30 * MJPEG decoder. |
31 */ | |
32 | |
33 //#define DEBUG | |
34 #include <assert.h> | |
35 | |
36 #include "avcodec.h" | |
37 #include "dsputil.h" | |
38 #include "mjpeg.h" | |
5041 | 39 #include "mjpegdec.h" |
5020 | 40 #include "jpeglsdec.h" |
41 | |
42 | |
43 static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table, | |
44 int nb_codes, int use_static, int is_ac) | |
45 { | |
46 uint8_t huff_size[256+16]; | |
47 uint16_t huff_code[256+16]; | |
48 | |
49 assert(nb_codes <= 256); | |
50 | |
51 memset(huff_size, 0, sizeof(huff_size)); | |
5021 | 52 ff_mjpeg_build_huffman_codes(huff_size, huff_code, bits_table, val_table); |
5020 | 53 |
54 if(is_ac){ | |
55 memmove(huff_size+16, huff_size, sizeof(uint8_t)*nb_codes); | |
56 memmove(huff_code+16, huff_code, sizeof(uint16_t)*nb_codes); | |
57 memset(huff_size, 0, sizeof(uint8_t)*16); | |
58 memset(huff_code, 0, sizeof(uint16_t)*16); | |
59 nb_codes += 16; | |
60 } | |
61 | |
62 return init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2, use_static); | |
63 } | |
64 | |
5068
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
65 static void build_basic_mjpeg_vlc(MJpegDecodeContext * s) { |
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
66 build_vlc(&s->vlcs[0][0], ff_mjpeg_bits_dc_luminance, |
7136 | 67 ff_mjpeg_val_dc, 12, 0, 0); |
5068
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
68 build_vlc(&s->vlcs[0][1], ff_mjpeg_bits_dc_chrominance, |
7136 | 69 ff_mjpeg_val_dc, 12, 0, 0); |
5068
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
70 build_vlc(&s->vlcs[1][0], ff_mjpeg_bits_ac_luminance, |
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
71 ff_mjpeg_val_ac_luminance, 251, 0, 1); |
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
72 build_vlc(&s->vlcs[1][1], ff_mjpeg_bits_ac_chrominance, |
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
73 ff_mjpeg_val_ac_chrominance, 251, 0, 1); |
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
74 } |
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
75 |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6448
diff
changeset
|
76 av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) |
5020 | 77 { |
78 MJpegDecodeContext *s = avctx->priv_data; | |
79 | |
80 s->avctx = avctx; | |
81 dsputil_init(&s->dsp, avctx); | |
82 ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct); | |
83 s->buffer_size = 0; | |
84 s->buffer = NULL; | |
85 s->start_code = -1; | |
86 s->first_picture = 1; | |
87 s->org_height = avctx->coded_height; | |
88 | |
5068
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
89 build_basic_mjpeg_vlc(s); |
5020 | 90 |
91 if (avctx->flags & CODEC_FLAG_EXTERN_HUFF) | |
92 { | |
93 av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n"); | |
94 init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8); | |
5068
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
95 if (ff_mjpeg_decode_dht(s)) { |
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
96 av_log(avctx, AV_LOG_ERROR, "mjpeg: error using external huffman table, switching back to internal\n"); |
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
97 build_basic_mjpeg_vlc(s); |
93e369c55c31
fix mjpeg decoding with broken huffman table headers
ods15
parents:
5044
diff
changeset
|
98 } |
5020 | 99 } |
100 if (avctx->extradata_size > 9 && | |
101 AV_RL32(avctx->extradata + 4) == MKTAG('f','i','e','l')) { | |
102 if (avctx->extradata[9] == 6) { /* quicktime icefloe 019 */ | |
103 s->interlace_polarity = 1; /* bottom field first */ | |
104 av_log(avctx, AV_LOG_DEBUG, "mjpeg bottom field first\n"); | |
105 } | |
106 } | |
107 | |
108 return 0; | |
109 } | |
110 | |
111 | |
112 /* quantize tables */ | |
5044 | 113 int ff_mjpeg_decode_dqt(MJpegDecodeContext *s) |
5020 | 114 { |
115 int len, index, i, j; | |
116 | |
117 len = get_bits(&s->gb, 16) - 2; | |
118 | |
119 while (len >= 65) { | |
120 /* only 8 bit precision handled */ | |
121 if (get_bits(&s->gb, 4) != 0) | |
122 { | |
123 av_log(s->avctx, AV_LOG_ERROR, "dqt: 16bit precision\n"); | |
124 return -1; | |
125 } | |
126 index = get_bits(&s->gb, 4); | |
127 if (index >= 4) | |
128 return -1; | |
129 av_log(s->avctx, AV_LOG_DEBUG, "index=%d\n", index); | |
130 /* read quant table */ | |
131 for(i=0;i<64;i++) { | |
132 j = s->scantable.permutated[i]; | |
133 s->quant_matrixes[index][j] = get_bits(&s->gb, 8); | |
134 } | |
135 | |
136 //XXX FIXME finetune, and perhaps add dc too | |
137 s->qscale[index]= FFMAX( | |
138 s->quant_matrixes[index][s->scantable.permutated[1]], | |
139 s->quant_matrixes[index][s->scantable.permutated[8]]) >> 1; | |
140 av_log(s->avctx, AV_LOG_DEBUG, "qscale[%d]: %d\n", index, s->qscale[index]); | |
141 len -= 65; | |
142 } | |
143 | |
144 return 0; | |
145 } | |
146 | |
147 /* decode huffman tables and build VLC decoders */ | |
5044 | 148 int ff_mjpeg_decode_dht(MJpegDecodeContext *s) |
5020 | 149 { |
150 int len, index, i, class, n, v, code_max; | |
151 uint8_t bits_table[17]; | |
152 uint8_t val_table[256]; | |
153 | |
154 len = get_bits(&s->gb, 16) - 2; | |
155 | |
156 while (len > 0) { | |
157 if (len < 17) | |
158 return -1; | |
159 class = get_bits(&s->gb, 4); | |
160 if (class >= 2) | |
161 return -1; | |
162 index = get_bits(&s->gb, 4); | |
163 if (index >= 4) | |
164 return -1; | |
165 n = 0; | |
166 for(i=1;i<=16;i++) { | |
167 bits_table[i] = get_bits(&s->gb, 8); | |
168 n += bits_table[i]; | |
169 } | |
170 len -= 17; | |
171 if (len < n || n > 256) | |
172 return -1; | |
173 | |
174 code_max = 0; | |
175 for(i=0;i<n;i++) { | |
176 v = get_bits(&s->gb, 8); | |
177 if (v > code_max) | |
178 code_max = v; | |
179 val_table[i] = v; | |
180 } | |
181 len -= n; | |
182 | |
183 /* build VLC and flush previous vlc if present */ | |
184 free_vlc(&s->vlcs[class][index]); | |
185 av_log(s->avctx, AV_LOG_DEBUG, "class=%d index=%d nb_codes=%d\n", | |
186 class, index, code_max + 1); | |
187 if(build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1, 0, class > 0) < 0){ | |
188 return -1; | |
189 } | |
190 } | |
191 return 0; | |
192 } | |
193 | |
5044 | 194 int ff_mjpeg_decode_sof(MJpegDecodeContext *s) |
5020 | 195 { |
196 int len, nb_components, i, width, height, pix_fmt_id; | |
197 | |
198 /* XXX: verify len field validity */ | |
199 len = get_bits(&s->gb, 16); | |
200 s->bits= get_bits(&s->gb, 8); | |
201 | |
202 if(s->pegasus_rct) s->bits=9; | |
203 if(s->bits==9 && !s->pegasus_rct) s->rct=1; //FIXME ugly | |
204 | |
205 if (s->bits != 8 && !s->lossless){ | |
206 av_log(s->avctx, AV_LOG_ERROR, "only 8 bits/component accepted\n"); | |
207 return -1; | |
208 } | |
209 | |
210 height = get_bits(&s->gb, 16); | |
211 width = get_bits(&s->gb, 16); | |
212 | |
213 //HACK for odd_height.mov | |
214 if(s->interlaced && s->width == width && s->height == height + 1) | |
215 height= s->height; | |
216 | |
217 av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height); | |
218 if(avcodec_check_dimensions(s->avctx, width, height)) | |
219 return -1; | |
220 | |
221 nb_components = get_bits(&s->gb, 8); | |
222 if (nb_components <= 0 || | |
223 nb_components > MAX_COMPONENTS) | |
224 return -1; | |
225 if (s->ls && !(s->bits <= 8 || nb_components == 1)){ | |
226 av_log(s->avctx, AV_LOG_ERROR, "only <= 8 bits/component or 16-bit gray accepted for JPEG-LS\n"); | |
227 return -1; | |
228 } | |
229 s->nb_components = nb_components; | |
230 s->h_max = 1; | |
231 s->v_max = 1; | |
232 for(i=0;i<nb_components;i++) { | |
233 /* component id */ | |
234 s->component_id[i] = get_bits(&s->gb, 8) - 1; | |
235 s->h_count[i] = get_bits(&s->gb, 4); | |
236 s->v_count[i] = get_bits(&s->gb, 4); | |
237 /* compute hmax and vmax (only used in interleaved case) */ | |
238 if (s->h_count[i] > s->h_max) | |
239 s->h_max = s->h_count[i]; | |
240 if (s->v_count[i] > s->v_max) | |
241 s->v_max = s->v_count[i]; | |
242 s->quant_index[i] = get_bits(&s->gb, 8); | |
243 if (s->quant_index[i] >= 4) | |
244 return -1; | |
245 av_log(s->avctx, AV_LOG_DEBUG, "component %d %d:%d id: %d quant:%d\n", i, s->h_count[i], | |
246 s->v_count[i], s->component_id[i], s->quant_index[i]); | |
247 } | |
248 | |
249 if(s->ls && (s->h_max > 1 || s->v_max > 1)) { | |
250 av_log(s->avctx, AV_LOG_ERROR, "Subsampling in JPEG-LS is not supported.\n"); | |
251 return -1; | |
252 } | |
253 | |
254 if(s->v_max==1 && s->h_max==1 && s->lossless==1) s->rgb=1; | |
255 | |
256 /* if different size, realloc/alloc picture */ | |
257 /* XXX: also check h_count and v_count */ | |
258 if (width != s->width || height != s->height) { | |
259 av_freep(&s->qscale_table); | |
260 | |
261 s->width = width; | |
262 s->height = height; | |
263 s->interlaced = 0; | |
264 | |
265 /* test interlaced mode */ | |
266 if (s->first_picture && | |
267 s->org_height != 0 && | |
268 s->height < ((s->org_height * 3) / 4)) { | |
269 s->interlaced = 1; | |
270 s->bottom_field = s->interlace_polarity; | |
271 s->picture.interlaced_frame = 1; | |
272 s->picture.top_field_first = !s->interlace_polarity; | |
273 height *= 2; | |
274 } | |
275 | |
276 avcodec_set_dimensions(s->avctx, width, height); | |
277 | |
278 s->qscale_table= av_mallocz((s->width+15)/16); | |
279 | |
280 s->first_picture = 0; | |
281 } | |
282 | |
283 if(s->interlaced && (s->bottom_field == !s->interlace_polarity)) | |
284 return 0; | |
285 | |
286 /* XXX: not complete test ! */ | |
7930
fae5e74eef1b
Check the 4th plane too when selecting the pixfmt.
michael
parents:
7478
diff
changeset
|
287 pix_fmt_id = (s->h_count[0] << 28) | (s->v_count[0] << 24) | |
fae5e74eef1b
Check the 4th plane too when selecting the pixfmt.
michael
parents:
7478
diff
changeset
|
288 (s->h_count[1] << 20) | (s->v_count[1] << 16) | |
fae5e74eef1b
Check the 4th plane too when selecting the pixfmt.
michael
parents:
7478
diff
changeset
|
289 (s->h_count[2] << 12) | (s->v_count[2] << 8) | |
fae5e74eef1b
Check the 4th plane too when selecting the pixfmt.
michael
parents:
7478
diff
changeset
|
290 (s->h_count[3] << 4) | s->v_count[3]; |
5020 | 291 av_log(s->avctx, AV_LOG_DEBUG, "pix fmt id %x\n", pix_fmt_id); |
7931
fd6c05a225aa
Simplify pix_fmt_id instead of listing a subset of non-simplified ones.
michael
parents:
7930
diff
changeset
|
292 if(!(pix_fmt_id & 0x10101010)) |
fd6c05a225aa
Simplify pix_fmt_id instead of listing a subset of non-simplified ones.
michael
parents:
7930
diff
changeset
|
293 pix_fmt_id-= (pix_fmt_id & 0xF0F0F0F0)>>1; |
fd6c05a225aa
Simplify pix_fmt_id instead of listing a subset of non-simplified ones.
michael
parents:
7930
diff
changeset
|
294 if(!(pix_fmt_id & 0x01010101)) |
fd6c05a225aa
Simplify pix_fmt_id instead of listing a subset of non-simplified ones.
michael
parents:
7930
diff
changeset
|
295 pix_fmt_id-= (pix_fmt_id & 0x0F0F0F0F)>>1; |
fd6c05a225aa
Simplify pix_fmt_id instead of listing a subset of non-simplified ones.
michael
parents:
7930
diff
changeset
|
296 |
5020 | 297 switch(pix_fmt_id){ |
7930
fae5e74eef1b
Check the 4th plane too when selecting the pixfmt.
michael
parents:
7478
diff
changeset
|
298 case 0x11111100: |
5020 | 299 if(s->rgb){ |
300 s->avctx->pix_fmt = PIX_FMT_RGB32; | |
7932
7729da3e4866
Replace apparently always true condition by assert().
michael
parents:
7931
diff
changeset
|
301 }else |
5020 | 302 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV444P : PIX_FMT_YUVJ444P; |
7932
7729da3e4866
Replace apparently always true condition by assert().
michael
parents:
7931
diff
changeset
|
303 assert(s->nb_components==3); |
5020 | 304 break; |
7930
fae5e74eef1b
Check the 4th plane too when selecting the pixfmt.
michael
parents:
7478
diff
changeset
|
305 case 0x11000000: |
5478
41103dc22ad5
Add support for grayscale MJPEG streams sent by Axis cameras such as the
diego
parents:
5381
diff
changeset
|
306 s->avctx->pix_fmt = PIX_FMT_GRAY8; |
41103dc22ad5
Add support for grayscale MJPEG streams sent by Axis cameras such as the
diego
parents:
5381
diff
changeset
|
307 break; |
7930
fae5e74eef1b
Check the 4th plane too when selecting the pixfmt.
michael
parents:
7478
diff
changeset
|
308 case 0x12111100: |
5363 | 309 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV440P : PIX_FMT_YUVJ440P; |
310 break; | |
7930
fae5e74eef1b
Check the 4th plane too when selecting the pixfmt.
michael
parents:
7478
diff
changeset
|
311 case 0x21111100: |
5020 | 312 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV422P : PIX_FMT_YUVJ422P; |
313 break; | |
7930
fae5e74eef1b
Check the 4th plane too when selecting the pixfmt.
michael
parents:
7478
diff
changeset
|
314 case 0x22111100: |
5020 | 315 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV420P : PIX_FMT_YUVJ420P; |
316 break; | |
5381
4cac2cfe2745
bail out on unknown jpeg pixel format instead of silently decoding data incorrectly
gpoirier
parents:
5363
diff
changeset
|
317 default: |
4cac2cfe2745
bail out on unknown jpeg pixel format instead of silently decoding data incorrectly
gpoirier
parents:
5363
diff
changeset
|
318 av_log(s->avctx, AV_LOG_ERROR, "Unhandled pixel format 0x%x\n", pix_fmt_id); |
4cac2cfe2745
bail out on unknown jpeg pixel format instead of silently decoding data incorrectly
gpoirier
parents:
5363
diff
changeset
|
319 return -1; |
5020 | 320 } |
321 if(s->ls){ | |
322 if(s->nb_components > 1) | |
323 s->avctx->pix_fmt = PIX_FMT_RGB24; | |
324 else if(s->bits <= 8) | |
325 s->avctx->pix_fmt = PIX_FMT_GRAY8; | |
326 else | |
327 s->avctx->pix_fmt = PIX_FMT_GRAY16; | |
328 } | |
329 | |
330 if(s->picture.data[0]) | |
331 s->avctx->release_buffer(s->avctx, &s->picture); | |
332 | |
333 s->picture.reference= 0; | |
334 if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){ | |
335 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); | |
336 return -1; | |
337 } | |
6448
7fa807dd7958
remove #include "mpegvideo.h" where it is not needed
aurel
parents:
6222
diff
changeset
|
338 s->picture.pict_type= FF_I_TYPE; |
5020 | 339 s->picture.key_frame= 1; |
340 | |
341 for(i=0; i<3; i++){ | |
342 s->linesize[i]= s->picture.linesize[i] << s->interlaced; | |
343 } | |
344 | |
345 // printf("%d %d %d %d %d %d\n", s->width, s->height, s->linesize[0], s->linesize[1], s->interlaced, s->avctx->height); | |
346 | |
347 if (len != (8+(3*nb_components))) | |
348 { | |
349 av_log(s->avctx, AV_LOG_DEBUG, "decode_sof0: error, len(%d) mismatch\n", len); | |
350 } | |
351 | |
352 /* totally blank picture as progressive JPEG will only add details to it */ | |
353 if(s->progressive){ | |
8287 | 354 int bw = (width + s->h_max*8-1) / (s->h_max*8); |
355 int bh = (height + s->v_max*8-1) / (s->v_max*8); | |
356 for(i=0; i<s->nb_components; i++) { | |
357 int size = bw * bh * s->h_count[i] * s->v_count[i]; | |
358 av_freep(&s->blocks[i]); | |
359 av_freep(&s->last_nnz[i]); | |
360 s->blocks[i] = av_malloc(size * sizeof(**s->blocks)); | |
361 s->last_nnz[i] = av_mallocz(size * sizeof(**s->last_nnz)); | |
362 s->block_stride[i] = bw * s->h_count[i]; | |
363 } | |
364 memset(s->coefs_finished, 0, sizeof(s->coefs_finished)); | |
5020 | 365 } |
366 return 0; | |
367 } | |
368 | |
369 static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index) | |
370 { | |
371 int code; | |
372 code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2); | |
373 if (code < 0) | |
374 { | |
375 av_log(s->avctx, AV_LOG_WARNING, "mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index, | |
376 &s->vlcs[0][dc_index]); | |
377 return 0xffff; | |
378 } | |
379 | |
380 if(code) | |
381 return get_xbits(&s->gb, code); | |
382 else | |
383 return 0; | |
384 } | |
385 | |
386 /* decode block and dequantize */ | |
387 static int decode_block(MJpegDecodeContext *s, DCTELEM *block, | |
388 int component, int dc_index, int ac_index, int16_t *quant_matrix) | |
389 { | |
390 int code, i, j, level, val; | |
391 | |
392 /* DC coef */ | |
393 val = mjpeg_decode_dc(s, dc_index); | |
394 if (val == 0xffff) { | |
395 av_log(s->avctx, AV_LOG_ERROR, "error dc\n"); | |
396 return -1; | |
397 } | |
398 val = val * quant_matrix[0] + s->last_dc[component]; | |
399 s->last_dc[component] = val; | |
400 block[0] = val; | |
401 /* AC coefs */ | |
402 i = 0; | |
403 {OPEN_READER(re, &s->gb) | |
404 for(;;) { | |
405 UPDATE_CACHE(re, &s->gb); | |
406 GET_VLC(code, re, &s->gb, s->vlcs[1][ac_index].table, 9, 2) | |
407 | |
408 /* EOB */ | |
409 if (code == 0x10) | |
410 break; | |
411 i += ((unsigned)code) >> 4; | |
412 if(code != 0x100){ | |
413 code &= 0xf; | |
414 if(code > MIN_CACHE_BITS - 16){ | |
415 UPDATE_CACHE(re, &s->gb) | |
416 } | |
417 { | |
418 int cache=GET_CACHE(re,&s->gb); | |
419 int sign=(~cache)>>31; | |
420 level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign; | |
421 } | |
422 | |
423 LAST_SKIP_BITS(re, &s->gb, code) | |
424 | |
425 if (i >= 63) { | |
426 if(i == 63){ | |
427 j = s->scantable.permutated[63]; | |
428 block[j] = level * quant_matrix[j]; | |
429 break; | |
430 } | |
431 av_log(s->avctx, AV_LOG_ERROR, "error count: %d\n", i); | |
432 return -1; | |
433 } | |
434 j = s->scantable.permutated[i]; | |
435 block[j] = level * quant_matrix[j]; | |
436 } | |
437 } | |
438 CLOSE_READER(re, &s->gb)} | |
439 | |
440 return 0; | |
441 } | |
442 | |
8287 | 443 static int decode_dc_progressive(MJpegDecodeContext *s, DCTELEM *block, int component, |
444 int dc_index, int16_t *quant_matrix, int Al) | |
445 { | |
446 int val; | |
8288 | 447 s->dsp.clear_block(block); |
8287 | 448 val = mjpeg_decode_dc(s, dc_index); |
449 if (val == 0xffff) { | |
450 av_log(s->avctx, AV_LOG_ERROR, "error dc\n"); | |
451 return -1; | |
452 } | |
453 val = (val * quant_matrix[0] << Al) + s->last_dc[component]; | |
454 s->last_dc[component] = val; | |
455 block[0] = val; | |
456 return 0; | |
457 } | |
458 | |
5020 | 459 /* decode block and dequantize - progressive JPEG version */ |
8287 | 460 static int decode_block_progressive(MJpegDecodeContext *s, DCTELEM *block, uint8_t *last_nnz, |
461 int ac_index, int16_t *quant_matrix, | |
462 int ss, int se, int Al, int *EOBRUN) | |
5020 | 463 { |
464 int code, i, j, level, val, run; | |
465 | |
466 if(*EOBRUN){ | |
467 (*EOBRUN)--; | |
468 return 0; | |
469 } | |
470 {OPEN_READER(re, &s->gb) | |
471 for(i=ss;;i++) { | |
472 UPDATE_CACHE(re, &s->gb); | |
473 GET_VLC(code, re, &s->gb, s->vlcs[1][ac_index].table, 9, 2) | |
474 /* Progressive JPEG use AC coeffs from zero and this decoder sets offset 16 by default */ | |
475 code -= 16; | |
476 if(code & 0xF) { | |
477 i += ((unsigned) code) >> 4; | |
478 code &= 0xf; | |
479 if(code > MIN_CACHE_BITS - 16){ | |
480 UPDATE_CACHE(re, &s->gb) | |
481 } | |
482 { | |
483 int cache=GET_CACHE(re,&s->gb); | |
484 int sign=(~cache)>>31; | |
485 level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign; | |
486 } | |
487 | |
488 LAST_SKIP_BITS(re, &s->gb, code) | |
489 | |
490 if (i >= se) { | |
491 if(i == se){ | |
492 j = s->scantable.permutated[se]; | |
493 block[j] = level * quant_matrix[j] << Al; | |
494 break; | |
495 } | |
496 av_log(s->avctx, AV_LOG_ERROR, "error count: %d\n", i); | |
497 return -1; | |
498 } | |
499 j = s->scantable.permutated[i]; | |
500 block[j] = level * quant_matrix[j] << Al; | |
501 }else{ | |
502 run = ((unsigned) code) >> 4; | |
503 if(run == 0xF){// ZRL - skip 15 coefficients | |
504 i += 15; | |
505 }else{ | |
506 val = run; | |
507 run = (1 << run); | |
508 UPDATE_CACHE(re, &s->gb); | |
509 run += (GET_CACHE(re, &s->gb) >> (32 - val)) & (run - 1); | |
510 if(val) | |
511 LAST_SKIP_BITS(re, &s->gb, val); | |
512 *EOBRUN = run - 1; | |
513 break; | |
514 } | |
515 } | |
516 } | |
517 CLOSE_READER(re, &s->gb)} | |
8287 | 518 if(i > *last_nnz) |
519 *last_nnz = i; | |
520 return 0; | |
521 } | |
522 | |
523 #define REFINE_BIT(j) {\ | |
524 UPDATE_CACHE(re, &s->gb);\ | |
525 sign = block[j]>>15;\ | |
526 block[j] += SHOW_UBITS(re, &s->gb, 1) * ((quant_matrix[j]^sign)-sign) << Al;\ | |
527 LAST_SKIP_BITS(re, &s->gb, 1);\ | |
528 } | |
529 | |
530 #define ZERO_RUN \ | |
531 for(;;i++) {\ | |
532 if(i > last) {\ | |
533 i += run;\ | |
534 if(i > se) {\ | |
535 av_log(s->avctx, AV_LOG_ERROR, "error count: %d\n", i);\ | |
536 return -1;\ | |
537 }\ | |
538 break;\ | |
539 }\ | |
540 j = s->scantable.permutated[i];\ | |
541 if(block[j])\ | |
542 REFINE_BIT(j)\ | |
543 else if(run-- == 0)\ | |
544 break;\ | |
545 } | |
546 | |
547 /* decode block and dequantize - progressive JPEG refinement pass */ | |
548 static int decode_block_refinement(MJpegDecodeContext *s, DCTELEM *block, uint8_t *last_nnz, | |
549 int ac_index, int16_t *quant_matrix, | |
550 int ss, int se, int Al, int *EOBRUN) | |
551 { | |
552 int code, i=ss, j, sign, val, run; | |
553 int last = FFMIN(se, *last_nnz); | |
554 | |
555 OPEN_READER(re, &s->gb); | |
556 if(*EOBRUN) | |
557 (*EOBRUN)--; | |
558 else { | |
559 for(;;i++) { | |
560 UPDATE_CACHE(re, &s->gb); | |
561 GET_VLC(code, re, &s->gb, s->vlcs[1][ac_index].table, 9, 2) | |
562 /* Progressive JPEG use AC coeffs from zero and this decoder sets offset 16 by default */ | |
563 code -= 16; | |
564 if(code & 0xF) { | |
565 run = ((unsigned) code) >> 4; | |
566 UPDATE_CACHE(re, &s->gb); | |
567 val = SHOW_UBITS(re, &s->gb, 1); | |
568 LAST_SKIP_BITS(re, &s->gb, 1); | |
569 ZERO_RUN; | |
570 j = s->scantable.permutated[i]; | |
571 val--; | |
572 block[j] = ((quant_matrix[j]^val)-val) << Al; | |
573 if(i == se) { | |
574 if(i > *last_nnz) | |
575 *last_nnz = i; | |
576 CLOSE_READER(re, &s->gb) | |
577 return 0; | |
578 } | |
579 }else{ | |
580 run = ((unsigned) code) >> 4; | |
581 if(run == 0xF){ | |
582 ZERO_RUN; | |
583 }else{ | |
584 val = run; | |
585 run = (1 << run); | |
586 if(val) { | |
587 UPDATE_CACHE(re, &s->gb); | |
588 run += SHOW_UBITS(re, &s->gb, val); | |
589 LAST_SKIP_BITS(re, &s->gb, val); | |
590 } | |
591 *EOBRUN = run - 1; | |
592 break; | |
593 } | |
594 } | |
595 } | |
596 | |
597 if(i > *last_nnz) | |
598 *last_nnz = i; | |
599 } | |
600 | |
601 for(;i<=last;i++) { | |
602 j = s->scantable.permutated[i]; | |
603 if(block[j]) | |
604 REFINE_BIT(j) | |
605 } | |
606 CLOSE_READER(re, &s->gb); | |
5020 | 607 |
608 return 0; | |
609 } | |
8287 | 610 #undef REFINE_BIT |
611 #undef ZERO_RUN | |
5020 | 612 |
613 static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor, int point_transform){ | |
614 int i, mb_x, mb_y; | |
615 uint16_t buffer[32768][4]; | |
616 int left[3], top[3], topleft[3]; | |
617 const int linesize= s->linesize[0]; | |
618 const int mask= (1<<s->bits)-1; | |
619 | |
620 if((unsigned)s->mb_width > 32768) //dynamic alloc | |
621 return -1; | |
622 | |
623 for(i=0; i<3; i++){ | |
624 buffer[0][i]= 1 << (s->bits + point_transform - 1); | |
625 } | |
626 for(mb_y = 0; mb_y < s->mb_height; mb_y++) { | |
627 const int modified_predictor= mb_y ? predictor : 1; | |
628 uint8_t *ptr = s->picture.data[0] + (linesize * mb_y); | |
629 | |
630 if (s->interlaced && s->bottom_field) | |
631 ptr += linesize >> 1; | |
632 | |
633 for(i=0; i<3; i++){ | |
634 top[i]= left[i]= topleft[i]= buffer[0][i]; | |
635 } | |
636 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
637 if (s->restart_interval && !s->restart_count) | |
638 s->restart_count = s->restart_interval; | |
639 | |
640 for(i=0;i<3;i++) { | |
641 int pred; | |
642 | |
643 topleft[i]= top[i]; | |
644 top[i]= buffer[mb_x][i]; | |
645 | |
646 PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); | |
647 | |
648 left[i]= | |
649 buffer[mb_x][i]= mask & (pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform)); | |
650 } | |
651 | |
652 if (s->restart_interval && !--s->restart_count) { | |
653 align_get_bits(&s->gb); | |
654 skip_bits(&s->gb, 16); /* skip RSTn */ | |
655 } | |
656 } | |
657 | |
658 if(s->rct){ | |
659 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
660 ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2] - 0x200)>>2); | |
661 ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1]; | |
662 ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1]; | |
663 } | |
664 }else if(s->pegasus_rct){ | |
665 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
666 ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2])>>2); | |
667 ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1]; | |
668 ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1]; | |
669 } | |
670 }else{ | |
671 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
672 ptr[4*mb_x+0] = buffer[mb_x][0]; | |
673 ptr[4*mb_x+1] = buffer[mb_x][1]; | |
674 ptr[4*mb_x+2] = buffer[mb_x][2]; | |
675 } | |
676 } | |
677 } | |
678 return 0; | |
679 } | |
680 | |
681 static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point_transform){ | |
682 int i, mb_x, mb_y; | |
683 const int nb_components=3; | |
684 | |
685 for(mb_y = 0; mb_y < s->mb_height; mb_y++) { | |
686 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
687 if (s->restart_interval && !s->restart_count) | |
688 s->restart_count = s->restart_interval; | |
689 | |
690 if(mb_x==0 || mb_y==0 || s->interlaced){ | |
691 for(i=0;i<nb_components;i++) { | |
692 uint8_t *ptr; | |
693 int n, h, v, x, y, c, j, linesize; | |
694 n = s->nb_blocks[i]; | |
695 c = s->comp_index[i]; | |
696 h = s->h_scount[i]; | |
697 v = s->v_scount[i]; | |
698 x = 0; | |
699 y = 0; | |
700 linesize= s->linesize[c]; | |
701 | |
702 for(j=0; j<n; j++) { | |
703 int pred; | |
704 | |
705 ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap | |
706 if(y==0 && mb_y==0){ | |
707 if(x==0 && mb_x==0){ | |
708 pred= 128 << point_transform; | |
709 }else{ | |
710 pred= ptr[-1]; | |
711 } | |
712 }else{ | |
713 if(x==0 && mb_x==0){ | |
714 pred= ptr[-linesize]; | |
715 }else{ | |
716 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); | |
717 } | |
718 } | |
719 | |
720 if (s->interlaced && s->bottom_field) | |
721 ptr += linesize >> 1; | |
722 *ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform); | |
723 | |
724 if (++x == h) { | |
725 x = 0; | |
726 y++; | |
727 } | |
728 } | |
729 } | |
730 }else{ | |
731 for(i=0;i<nb_components;i++) { | |
732 uint8_t *ptr; | |
733 int n, h, v, x, y, c, j, linesize; | |
734 n = s->nb_blocks[i]; | |
735 c = s->comp_index[i]; | |
736 h = s->h_scount[i]; | |
737 v = s->v_scount[i]; | |
738 x = 0; | |
739 y = 0; | |
740 linesize= s->linesize[c]; | |
741 | |
742 for(j=0; j<n; j++) { | |
743 int pred; | |
744 | |
745 ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap | |
746 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); | |
747 *ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform); | |
748 if (++x == h) { | |
749 x = 0; | |
750 y++; | |
751 } | |
752 } | |
753 } | |
754 } | |
755 if (s->restart_interval && !--s->restart_count) { | |
756 align_get_bits(&s->gb); | |
757 skip_bits(&s->gb, 16); /* skip RSTn */ | |
758 } | |
759 } | |
760 } | |
761 return 0; | |
762 } | |
763 | |
8287 | 764 static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, int Al){ |
5020 | 765 int i, mb_x, mb_y; |
5734 | 766 uint8_t* data[MAX_COMPONENTS]; |
767 int linesize[MAX_COMPONENTS]; | |
5020 | 768 |
5734 | 769 for(i=0; i < nb_components; i++) { |
770 int c = s->comp_index[i]; | |
771 data[c] = s->picture.data[c]; | |
772 linesize[c]=s->linesize[c]; | |
8287 | 773 s->coefs_finished[c] |= 1; |
5736 | 774 if(s->avctx->codec->id==CODEC_ID_AMV) { |
775 //picture should be flipped upside-down for this codec | |
5818 | 776 assert(!(s->avctx->flags & CODEC_FLAG_EMU_EDGE)); |
777 data[c] += (linesize[c] * (s->v_scount[i] * (8 * s->mb_height -((s->height/s->v_max)&7)) - 1 )); | |
5736 | 778 linesize[c] *= -1; |
779 } | |
5734 | 780 } |
781 | |
5020 | 782 for(mb_y = 0; mb_y < s->mb_height; mb_y++) { |
783 for(mb_x = 0; mb_x < s->mb_width; mb_x++) { | |
784 if (s->restart_interval && !s->restart_count) | |
785 s->restart_count = s->restart_interval; | |
786 | |
787 for(i=0;i<nb_components;i++) { | |
788 uint8_t *ptr; | |
789 int n, h, v, x, y, c, j; | |
790 n = s->nb_blocks[i]; | |
791 c = s->comp_index[i]; | |
792 h = s->h_scount[i]; | |
793 v = s->v_scount[i]; | |
794 x = 0; | |
795 y = 0; | |
796 for(j=0;j<n;j++) { | |
5734 | 797 ptr = data[c] + |
798 (((linesize[c] * (v * mb_y + y) * 8) + | |
5020 | 799 (h * mb_x + x) * 8) >> s->avctx->lowres); |
8287 | 800 if(s->interlaced && s->bottom_field) |
5734 | 801 ptr += linesize[c] >> 1; |
8287 | 802 if(!s->progressive) { |
8288 | 803 s->dsp.clear_block(s->block); |
8287 | 804 if(decode_block(s, s->block, i, |
805 s->dc_index[i], s->ac_index[i], | |
806 s->quant_matrixes[ s->quant_index[c] ]) < 0) { | |
807 av_log(s->avctx, AV_LOG_ERROR, "error y=%d x=%d\n", mb_y, mb_x); | |
808 return -1; | |
809 } | |
810 s->dsp.idct_put(ptr, linesize[c], s->block); | |
811 } else { | |
812 int block_idx = s->block_stride[c] * (v * mb_y + y) + (h * mb_x + x); | |
813 DCTELEM *block = s->blocks[c][block_idx]; | |
814 if(Ah) | |
815 block[0] += get_bits1(&s->gb) * s->quant_matrixes[ s->quant_index[c] ][0] << Al; | |
816 else if(decode_dc_progressive(s, block, i, s->dc_index[i], s->quant_matrixes[ s->quant_index[c] ], Al) < 0) { | |
817 av_log(s->avctx, AV_LOG_ERROR, "error y=%d x=%d\n", mb_y, mb_x); | |
818 return -1; | |
819 } | |
820 } | |
821 // av_log(s->avctx, AV_LOG_DEBUG, "mb: %d %d processed\n", mb_y, mb_x); | |
5020 | 822 //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); |
823 if (++x == h) { | |
824 x = 0; | |
825 y++; | |
826 } | |
827 } | |
828 } | |
829 /* (< 1350) buggy workaround for Spectralfan.mov, should be fixed */ | |
830 if (s->restart_interval && (s->restart_interval < 1350) && | |
831 !--s->restart_count) { | |
832 align_get_bits(&s->gb); | |
833 skip_bits(&s->gb, 16); /* skip RSTn */ | |
834 for (i=0; i<nb_components; i++) /* reset dc */ | |
835 s->last_dc[i] = 1024; | |
836 } | |
837 } | |
838 } | |
839 return 0; | |
840 } | |
841 | |
8287 | 842 static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss, int se, int Ah, int Al){ |
843 int mb_x, mb_y; | |
844 int EOBRUN = 0; | |
845 int c = s->comp_index[0]; | |
846 uint8_t* data = s->picture.data[c]; | |
847 int linesize = s->linesize[c]; | |
848 int last_scan = 0; | |
849 int16_t *quant_matrix = s->quant_matrixes[ s->quant_index[c] ]; | |
850 | |
851 if(!Al) { | |
852 s->coefs_finished[c] |= (1LL<<(se+1))-(1LL<<ss); | |
853 last_scan = !~s->coefs_finished[c]; | |
854 } | |
855 | |
856 if(s->interlaced && s->bottom_field) | |
857 data += linesize >> 1; | |
858 | |
859 for(mb_y = 0; mb_y < s->mb_height; mb_y++) { | |
860 uint8_t *ptr = data + (mb_y*linesize*8 >> s->avctx->lowres); | |
861 int block_idx = mb_y * s->block_stride[c]; | |
862 DCTELEM (*block)[64] = &s->blocks[c][block_idx]; | |
863 uint8_t *last_nnz = &s->last_nnz[c][block_idx]; | |
864 for(mb_x = 0; mb_x < s->mb_width; mb_x++, block++, last_nnz++) { | |
865 int ret; | |
866 if(Ah) | |
867 ret = decode_block_refinement(s, *block, last_nnz, s->ac_index[0], | |
868 quant_matrix, ss, se, Al, &EOBRUN); | |
869 else | |
870 ret = decode_block_progressive(s, *block, last_nnz, s->ac_index[0], | |
871 quant_matrix, ss, se, Al, &EOBRUN); | |
872 if(ret < 0) { | |
873 av_log(s->avctx, AV_LOG_ERROR, "error y=%d x=%d\n", mb_y, mb_x); | |
874 return -1; | |
875 } | |
876 if(last_scan) { | |
877 s->dsp.idct_put(ptr, linesize, *block); | |
878 ptr += 8 >> s->avctx->lowres; | |
879 } | |
880 } | |
881 } | |
882 return 0; | |
883 } | |
884 | |
5044 | 885 int ff_mjpeg_decode_sos(MJpegDecodeContext *s) |
5020 | 886 { |
887 int len, nb_components, i, h, v, predictor, point_transform; | |
9459
84932ac233a5
Remove unused variables from ff_mjpeg_decode_sos() found by CSA.
michael
parents:
9355
diff
changeset
|
888 int index, id; |
5020 | 889 const int block_size= s->lossless ? 1 : 8; |
890 int ilv, prev_shift; | |
891 | |
892 /* XXX: verify len field validity */ | |
893 len = get_bits(&s->gb, 16); | |
894 nb_components = get_bits(&s->gb, 8); | |
895 if (len != 6+2*nb_components) | |
896 { | |
897 av_log(s->avctx, AV_LOG_ERROR, "decode_sos: invalid len (%d)\n", len); | |
898 return -1; | |
899 } | |
900 for(i=0;i<nb_components;i++) { | |
901 id = get_bits(&s->gb, 8) - 1; | |
902 av_log(s->avctx, AV_LOG_DEBUG, "component: %d\n", id); | |
903 /* find component index */ | |
904 for(index=0;index<s->nb_components;index++) | |
905 if (id == s->component_id[index]) | |
906 break; | |
907 if (index == s->nb_components) | |
908 { | |
909 av_log(s->avctx, AV_LOG_ERROR, "decode_sos: index(%d) out of components\n", index); | |
910 return -1; | |
911 } | |
912 | |
913 s->comp_index[i] = index; | |
914 | |
915 s->nb_blocks[i] = s->h_count[index] * s->v_count[index]; | |
916 s->h_scount[i] = s->h_count[index]; | |
917 s->v_scount[i] = s->v_count[index]; | |
918 | |
919 s->dc_index[i] = get_bits(&s->gb, 4); | |
920 s->ac_index[i] = get_bits(&s->gb, 4); | |
921 | |
922 if (s->dc_index[i] < 0 || s->ac_index[i] < 0 || | |
923 s->dc_index[i] >= 4 || s->ac_index[i] >= 4) | |
924 goto out_of_range; | |
925 #if 0 //buggy | |
926 switch(s->start_code) | |
927 { | |
928 case SOF0: | |
929 if (dc_index[i] > 1 || ac_index[i] > 1) | |
930 goto out_of_range; | |
931 break; | |
932 case SOF1: | |
933 case SOF2: | |
934 if (dc_index[i] > 3 || ac_index[i] > 3) | |
935 goto out_of_range; | |
936 break; | |
937 case SOF3: | |
938 if (dc_index[i] > 3 || ac_index[i] != 0) | |
939 goto out_of_range; | |
940 break; | |
941 } | |
942 #endif | |
943 } | |
944 | |
945 predictor= get_bits(&s->gb, 8); /* JPEG Ss / lossless JPEG predictor /JPEG-LS NEAR */ | |
946 ilv= get_bits(&s->gb, 8); /* JPEG Se / JPEG-LS ILV */ | |
947 prev_shift = get_bits(&s->gb, 4); /* Ah */ | |
948 point_transform= get_bits(&s->gb, 4); /* Al */ | |
949 | |
950 for(i=0;i<nb_components;i++) | |
951 s->last_dc[i] = 1024; | |
952 | |
953 if (nb_components > 1) { | |
954 /* interleaved stream */ | |
955 s->mb_width = (s->width + s->h_max * block_size - 1) / (s->h_max * block_size); | |
956 s->mb_height = (s->height + s->v_max * block_size - 1) / (s->v_max * block_size); | |
957 } else if(!s->ls) { /* skip this for JPEG-LS */ | |
958 h = s->h_max / s->h_scount[0]; | |
959 v = s->v_max / s->v_scount[0]; | |
960 s->mb_width = (s->width + h * block_size - 1) / (h * block_size); | |
961 s->mb_height = (s->height + v * block_size - 1) / (v * block_size); | |
962 s->nb_blocks[0] = 1; | |
963 s->h_scount[0] = 1; | |
964 s->v_scount[0] = 1; | |
965 } | |
966 | |
967 if(s->avctx->debug & FF_DEBUG_PICT_INFO) | |
968 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" : "", | |
969 predictor, point_transform, ilv, s->bits, | |
970 s->pegasus_rct ? "PRCT" : (s->rct ? "RCT" : "")); | |
971 | |
972 | |
973 /* mjpeg-b can have padding bytes between sos and image data, skip them */ | |
974 for (i = s->mjpb_skiptosod; i > 0; i--) | |
975 skip_bits(&s->gb, 8); | |
976 | |
977 if(s->lossless){ | |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8288
diff
changeset
|
978 if(CONFIG_JPEGLS_DECODER && s->ls){ |
5020 | 979 // for(){ |
980 // reset_ls_coding_parameters(s, 0); | |
981 | |
7478
12d42593e467
Return an error when ff_jpegls_decode_picture fails.
benoit
parents:
7136
diff
changeset
|
982 if(ff_jpegls_decode_picture(s, predictor, point_transform, ilv) < 0) |
12d42593e467
Return an error when ff_jpegls_decode_picture fails.
benoit
parents:
7136
diff
changeset
|
983 return -1; |
5020 | 984 }else{ |
985 if(s->rgb){ | |
986 if(ljpeg_decode_rgb_scan(s, predictor, point_transform) < 0) | |
987 return -1; | |
988 }else{ | |
989 if(ljpeg_decode_yuv_scan(s, predictor, point_transform) < 0) | |
990 return -1; | |
991 } | |
992 } | |
993 }else{ | |
8287 | 994 if(s->progressive && predictor) { |
995 if(mjpeg_decode_scan_progressive_ac(s, predictor, ilv, prev_shift, point_transform) < 0) | |
996 return -1; | |
997 } else { | |
998 if(mjpeg_decode_scan(s, nb_components, prev_shift, point_transform) < 0) | |
999 return -1; | |
1000 } | |
5020 | 1001 } |
1002 emms_c(); | |
1003 return 0; | |
1004 out_of_range: | |
1005 av_log(s->avctx, AV_LOG_ERROR, "decode_sos: ac/dc index out of range\n"); | |
1006 return -1; | |
1007 } | |
1008 | |
1009 static int mjpeg_decode_dri(MJpegDecodeContext *s) | |
1010 { | |
1011 if (get_bits(&s->gb, 16) != 4) | |
1012 return -1; | |
1013 s->restart_interval = get_bits(&s->gb, 16); | |
1014 s->restart_count = 0; | |
1015 av_log(s->avctx, AV_LOG_DEBUG, "restart interval: %d\n", s->restart_interval); | |
1016 | |
1017 return 0; | |
1018 } | |
1019 | |
1020 static int mjpeg_decode_app(MJpegDecodeContext *s) | |
1021 { | |
1022 int len, id, i; | |
1023 | |
1024 len = get_bits(&s->gb, 16); | |
1025 if (len < 5) | |
1026 return -1; | |
1027 if(8*len + get_bits_count(&s->gb) > s->gb.size_in_bits) | |
1028 return -1; | |
1029 | |
1030 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); | |
1031 id = be2me_32(id); | |
1032 len -= 6; | |
1033 | |
1034 if(s->avctx->debug & FF_DEBUG_STARTCODE){ | |
1035 av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id); | |
1036 } | |
1037 | |
1038 /* buggy AVID, it puts EOI only at every 10th frame */ | |
1039 /* also this fourcc is used by non-avid files too, it holds some | |
1040 informations, but it's always present in AVID creates files */ | |
8612 | 1041 if (id == AV_RL32("AVI1")) |
5020 | 1042 { |
1043 /* structure: | |
1044 4bytes AVI1 | |
1045 1bytes polarity | |
1046 1bytes always zero | |
1047 4bytes field_size | |
1048 4bytes field_size_less_padding | |
1049 */ | |
1050 s->buggy_avid = 1; | |
1051 // if (s->first_picture) | |
1052 // printf("mjpeg: workarounding buggy AVID\n"); | |
1053 i = get_bits(&s->gb, 8); | |
1054 if (i==2) s->bottom_field= 1; | |
1055 else if(i==1) s->bottom_field= 0; | |
1056 #if 0 | |
1057 skip_bits(&s->gb, 8); | |
1058 skip_bits(&s->gb, 32); | |
1059 skip_bits(&s->gb, 32); | |
1060 len -= 10; | |
1061 #endif | |
1062 // if (s->interlace_polarity) | |
1063 // printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity); | |
1064 goto out; | |
1065 } | |
1066 | |
1067 // len -= 2; | |
1068 | |
8612 | 1069 if (id == AV_RL32("JFIF")) |
5020 | 1070 { |
1071 int t_w, t_h, v1, v2; | |
1072 skip_bits(&s->gb, 8); /* the trailing zero-byte */ | |
1073 v1= get_bits(&s->gb, 8); | |
1074 v2= get_bits(&s->gb, 8); | |
1075 skip_bits(&s->gb, 8); | |
1076 | |
1077 s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 16); | |
1078 s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 16); | |
1079 | |
1080 if (s->avctx->debug & FF_DEBUG_PICT_INFO) | |
1081 av_log(s->avctx, AV_LOG_INFO, "mjpeg: JFIF header found (version: %x.%x) SAR=%d/%d\n", | |
1082 v1, v2, | |
1083 s->avctx->sample_aspect_ratio.num, | |
1084 s->avctx->sample_aspect_ratio.den | |
1085 ); | |
1086 | |
1087 t_w = get_bits(&s->gb, 8); | |
1088 t_h = get_bits(&s->gb, 8); | |
1089 if (t_w && t_h) | |
1090 { | |
1091 /* skip thumbnail */ | |
1092 if (len-10-(t_w*t_h*3) > 0) | |
1093 len -= t_w*t_h*3; | |
1094 } | |
1095 len -= 10; | |
1096 goto out; | |
1097 } | |
1098 | |
8612 | 1099 if (id == AV_RL32("Adob") && (get_bits(&s->gb, 8) == 'e')) |
5020 | 1100 { |
1101 if (s->avctx->debug & FF_DEBUG_PICT_INFO) | |
1102 av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found\n"); | |
1103 skip_bits(&s->gb, 16); /* version */ | |
1104 skip_bits(&s->gb, 16); /* flags0 */ | |
1105 skip_bits(&s->gb, 16); /* flags1 */ | |
1106 skip_bits(&s->gb, 8); /* transform */ | |
1107 len -= 7; | |
1108 goto out; | |
1109 } | |
1110 | |
8612 | 1111 if (id == AV_RL32("LJIF")){ |
5020 | 1112 if (s->avctx->debug & FF_DEBUG_PICT_INFO) |
1113 av_log(s->avctx, AV_LOG_INFO, "Pegasus lossless jpeg header found\n"); | |
1114 skip_bits(&s->gb, 16); /* version ? */ | |
1115 skip_bits(&s->gb, 16); /* unknwon always 0? */ | |
1116 skip_bits(&s->gb, 16); /* unknwon always 0? */ | |
1117 skip_bits(&s->gb, 16); /* unknwon always 0? */ | |
1118 switch( get_bits(&s->gb, 8)){ | |
1119 case 1: | |
1120 s->rgb= 1; | |
1121 s->pegasus_rct=0; | |
1122 break; | |
1123 case 2: | |
1124 s->rgb= 1; | |
1125 s->pegasus_rct=1; | |
1126 break; | |
1127 default: | |
1128 av_log(s->avctx, AV_LOG_ERROR, "unknown colorspace\n"); | |
1129 } | |
1130 len -= 9; | |
1131 goto out; | |
1132 } | |
1133 | |
1134 /* Apple MJPEG-A */ | |
1135 if ((s->start_code == APP1) && (len > (0x28 - 8))) | |
1136 { | |
1137 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); | |
1138 id = be2me_32(id); | |
1139 len -= 4; | |
8612 | 1140 if (id == AV_RL32("mjpg")) /* Apple MJPEG-A */ |
5020 | 1141 { |
1142 #if 0 | |
1143 skip_bits(&s->gb, 32); /* field size */ | |
1144 skip_bits(&s->gb, 32); /* pad field size */ | |
1145 skip_bits(&s->gb, 32); /* next off */ | |
1146 skip_bits(&s->gb, 32); /* quant off */ | |
1147 skip_bits(&s->gb, 32); /* huff off */ | |
1148 skip_bits(&s->gb, 32); /* image off */ | |
1149 skip_bits(&s->gb, 32); /* scan off */ | |
1150 skip_bits(&s->gb, 32); /* data off */ | |
1151 #endif | |
1152 if (s->avctx->debug & FF_DEBUG_PICT_INFO) | |
1153 av_log(s->avctx, AV_LOG_INFO, "mjpeg: Apple MJPEG-A header found\n"); | |
1154 } | |
1155 } | |
1156 | |
1157 out: | |
1158 /* slow but needed for extreme adobe jpegs */ | |
1159 if (len < 0) | |
1160 av_log(s->avctx, AV_LOG_ERROR, "mjpeg: error, decode_app parser read over the end\n"); | |
1161 while(--len > 0) | |
1162 skip_bits(&s->gb, 8); | |
1163 | |
1164 return 0; | |
1165 } | |
1166 | |
1167 static int mjpeg_decode_com(MJpegDecodeContext *s) | |
1168 { | |
1169 int len = get_bits(&s->gb, 16); | |
1170 if (len >= 2 && 8*len - 16 + get_bits_count(&s->gb) <= s->gb.size_in_bits) { | |
1171 char *cbuf = av_malloc(len - 1); | |
1172 if (cbuf) { | |
1173 int i; | |
1174 for (i = 0; i < len - 2; i++) | |
1175 cbuf[i] = get_bits(&s->gb, 8); | |
1176 if (i > 0 && cbuf[i-1] == '\n') | |
1177 cbuf[i-1] = 0; | |
1178 else | |
1179 cbuf[i] = 0; | |
1180 | |
1181 if(s->avctx->debug & FF_DEBUG_PICT_INFO) | |
1182 av_log(s->avctx, AV_LOG_INFO, "mjpeg comment: '%s'\n", cbuf); | |
1183 | |
1184 /* buggy avid, it puts EOI only at every 10th frame */ | |
1185 if (!strcmp(cbuf, "AVID")) | |
1186 { | |
1187 s->buggy_avid = 1; | |
1188 // if (s->first_picture) | |
1189 // printf("mjpeg: workarounding buggy AVID\n"); | |
1190 } | |
1191 else if(!strcmp(cbuf, "CS=ITU601")){ | |
1192 s->cs_itu601= 1; | |
1193 } | |
1194 | |
1195 av_free(cbuf); | |
1196 } | |
1197 } | |
1198 | |
1199 return 0; | |
1200 } | |
1201 | |
1202 #if 0 | |
1203 static int valid_marker_list[] = | |
1204 { | |
1205 /* 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f */ | |
1206 /* 0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1207 /* 1 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1208 /* 2 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1209 /* 3 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1210 /* 4 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1211 /* 5 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1212 /* 6 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1213 /* 7 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1214 /* 8 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1215 /* 9 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1216 /* a */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1217 /* b */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | |
1218 /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | |
1219 /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | |
1220 /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, | |
1221 /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, | |
1222 } | |
1223 #endif | |
1224 | |
1225 /* return the 8 bit start code value and update the search | |
1226 state. Return -1 if no start code found */ | |
6222 | 1227 static int find_marker(const uint8_t **pbuf_ptr, const uint8_t *buf_end) |
5020 | 1228 { |
6222 | 1229 const uint8_t *buf_ptr; |
5020 | 1230 unsigned int v, v2; |
1231 int val; | |
1232 #ifdef DEBUG | |
1233 int skipped=0; | |
1234 #endif | |
1235 | |
1236 buf_ptr = *pbuf_ptr; | |
1237 while (buf_ptr < buf_end) { | |
1238 v = *buf_ptr++; | |
1239 v2 = *buf_ptr; | |
1240 if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe) && buf_ptr < buf_end) { | |
1241 val = *buf_ptr++; | |
1242 goto found; | |
1243 } | |
1244 #ifdef DEBUG | |
1245 skipped++; | |
1246 #endif | |
1247 } | |
1248 val = -1; | |
1249 found: | |
1250 #ifdef DEBUG | |
1251 av_log(NULL, AV_LOG_VERBOSE, "find_marker skipped %d bytes\n", skipped); | |
1252 #endif | |
1253 *pbuf_ptr = buf_ptr; | |
1254 return val; | |
1255 } | |
1256 | |
5041 | 1257 int ff_mjpeg_decode_frame(AVCodecContext *avctx, |
5020 | 1258 void *data, int *data_size, |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
1259 AVPacket *avpkt) |
5020 | 1260 { |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
1261 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
8718
diff
changeset
|
1262 int buf_size = avpkt->size; |
5020 | 1263 MJpegDecodeContext *s = avctx->priv_data; |
6222 | 1264 const uint8_t *buf_end, *buf_ptr; |
5020 | 1265 int start_code; |
1266 AVFrame *picture = data; | |
1267 | |
1268 buf_ptr = buf; | |
1269 buf_end = buf + buf_size; | |
1270 while (buf_ptr < buf_end) { | |
1271 /* find start next marker */ | |
1272 start_code = find_marker(&buf_ptr, buf_end); | |
1273 { | |
1274 /* EOF */ | |
1275 if (start_code < 0) { | |
1276 goto the_end; | |
1277 } else { | |
5153 | 1278 av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%td\n", start_code, buf_end - buf_ptr); |
5020 | 1279 |
1280 if ((buf_end - buf_ptr) > s->buffer_size) | |
1281 { | |
1282 av_free(s->buffer); | |
1283 s->buffer_size = buf_end-buf_ptr; | |
1284 s->buffer = av_malloc(s->buffer_size + FF_INPUT_BUFFER_PADDING_SIZE); | |
1285 av_log(avctx, AV_LOG_DEBUG, "buffer too small, expanding to %d bytes\n", | |
1286 s->buffer_size); | |
1287 } | |
1288 | |
1289 /* unescape buffer of SOS, use special treatment for JPEG-LS */ | |
1290 if (start_code == SOS && !s->ls) | |
1291 { | |
6222 | 1292 const uint8_t *src = buf_ptr; |
5020 | 1293 uint8_t *dst = s->buffer; |
1294 | |
1295 while (src<buf_end) | |
1296 { | |
1297 uint8_t x = *(src++); | |
1298 | |
1299 *(dst++) = x; | |
1300 if (avctx->codec_id != CODEC_ID_THP) | |
1301 { | |
1302 if (x == 0xff) { | |
1303 while (src < buf_end && x == 0xff) | |
1304 x = *(src++); | |
1305 | |
1306 if (x >= 0xd0 && x <= 0xd7) | |
1307 *(dst++) = x; | |
1308 else if (x) | |
1309 break; | |
1310 } | |
1311 } | |
1312 } | |
1313 init_get_bits(&s->gb, s->buffer, (dst - s->buffer)*8); | |
1314 | |
5153 | 1315 av_log(avctx, AV_LOG_DEBUG, "escaping removed %td bytes\n", |
5020 | 1316 (buf_end - buf_ptr) - (dst - s->buffer)); |
1317 } | |
1318 else if(start_code == SOS && s->ls){ | |
6222 | 1319 const uint8_t *src = buf_ptr; |
5020 | 1320 uint8_t *dst = s->buffer; |
1321 int bit_count = 0; | |
1322 int t = 0, b = 0; | |
1323 PutBitContext pb; | |
1324 | |
1325 s->cur_scan++; | |
1326 | |
1327 /* find marker */ | |
1328 while (src + t < buf_end){ | |
1329 uint8_t x = src[t++]; | |
1330 if (x == 0xff){ | |
1331 while((src + t < buf_end) && x == 0xff) | |
1332 x = src[t++]; | |
1333 if (x & 0x80) { | |
1334 t -= 2; | |
1335 break; | |
1336 } | |
1337 } | |
1338 } | |
1339 bit_count = t * 8; | |
1340 | |
1341 init_put_bits(&pb, dst, t); | |
1342 | |
1343 /* unescape bitstream */ | |
1344 while(b < t){ | |
1345 uint8_t x = src[b++]; | |
1346 put_bits(&pb, 8, x); | |
1347 if(x == 0xFF){ | |
1348 x = src[b++]; | |
1349 put_bits(&pb, 7, x); | |
1350 bit_count--; | |
1351 } | |
1352 } | |
1353 flush_put_bits(&pb); | |
1354 | |
1355 init_get_bits(&s->gb, dst, bit_count); | |
1356 } | |
1357 else | |
1358 init_get_bits(&s->gb, buf_ptr, (buf_end - buf_ptr)*8); | |
1359 | |
1360 s->start_code = start_code; | |
1361 if(s->avctx->debug & FF_DEBUG_STARTCODE){ | |
1362 av_log(avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code); | |
1363 } | |
1364 | |
1365 /* process markers */ | |
1366 if (start_code >= 0xd0 && start_code <= 0xd7) { | |
1367 av_log(avctx, AV_LOG_DEBUG, "restart marker: %d\n", start_code&0x0f); | |
1368 /* APP fields */ | |
1369 } else if (start_code >= APP0 && start_code <= APP15) { | |
1370 mjpeg_decode_app(s); | |
1371 /* Comment */ | |
1372 } else if (start_code == COM){ | |
1373 mjpeg_decode_com(s); | |
1374 } | |
1375 | |
1376 switch(start_code) { | |
1377 case SOI: | |
1378 s->restart_interval = 0; | |
1379 | |
1380 s->restart_count = 0; | |
1381 /* nothing to do on SOI */ | |
1382 break; | |
1383 case DQT: | |
5044 | 1384 ff_mjpeg_decode_dqt(s); |
5020 | 1385 break; |
1386 case DHT: | |
5044 | 1387 if(ff_mjpeg_decode_dht(s) < 0){ |
5020 | 1388 av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n"); |
1389 return -1; | |
1390 } | |
1391 break; | |
1392 case SOF0: | |
1393 s->lossless=0; | |
1394 s->ls=0; | |
1395 s->progressive=0; | |
5044 | 1396 if (ff_mjpeg_decode_sof(s) < 0) |
5020 | 1397 return -1; |
1398 break; | |
1399 case SOF2: | |
1400 s->lossless=0; | |
1401 s->ls=0; | |
1402 s->progressive=1; | |
5044 | 1403 if (ff_mjpeg_decode_sof(s) < 0) |
5020 | 1404 return -1; |
1405 break; | |
1406 case SOF3: | |
1407 s->lossless=1; | |
1408 s->ls=0; | |
1409 s->progressive=0; | |
5044 | 1410 if (ff_mjpeg_decode_sof(s) < 0) |
5020 | 1411 return -1; |
1412 break; | |
1413 case SOF48: | |
1414 s->lossless=1; | |
1415 s->ls=1; | |
1416 s->progressive=0; | |
5044 | 1417 if (ff_mjpeg_decode_sof(s) < 0) |
5020 | 1418 return -1; |
1419 break; | |
1420 case LSE: | |
8596
68e959302527
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_
aurel
parents:
8288
diff
changeset
|
1421 if (!CONFIG_JPEGLS_DECODER || ff_jpegls_decode_lse(s) < 0) |
5020 | 1422 return -1; |
1423 break; | |
1424 case EOI: | |
1425 s->cur_scan = 0; | |
1426 if ((s->buggy_avid && !s->interlaced) || s->restart_interval) | |
1427 break; | |
1428 eoi_parser: | |
1429 { | |
1430 if (s->interlaced) { | |
1431 s->bottom_field ^= 1; | |
1432 /* if not bottom field, do not output image yet */ | |
1433 if (s->bottom_field == !s->interlace_polarity) | |
1434 goto not_the_end; | |
1435 } | |
1436 *picture = s->picture; | |
1437 *data_size = sizeof(AVFrame); | |
1438 | |
1439 if(!s->lossless){ | |
6655
22cca5d3173a
Implement FFMAX3(a,b,c) - maximum over three arguments.
voroshil
parents:
6517
diff
changeset
|
1440 picture->quality= FFMAX3(s->qscale[0], s->qscale[1], s->qscale[2]); |
5020 | 1441 picture->qstride= 0; |
1442 picture->qscale_table= s->qscale_table; | |
1443 memset(picture->qscale_table, picture->quality, (s->width+15)/16); | |
1444 if(avctx->debug & FF_DEBUG_QP) | |
1445 av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality); | |
1446 picture->quality*= FF_QP2LAMBDA; | |
1447 } | |
1448 | |
1449 goto the_end; | |
1450 } | |
1451 break; | |
1452 case SOS: | |
5044 | 1453 ff_mjpeg_decode_sos(s); |
5020 | 1454 /* buggy avid puts EOI every 10-20th frame */ |
1455 /* if restart period is over process EOI */ | |
1456 if ((s->buggy_avid && !s->interlaced) || s->restart_interval) | |
1457 goto eoi_parser; | |
1458 break; | |
1459 case DRI: | |
1460 mjpeg_decode_dri(s); | |
1461 break; | |
1462 case SOF1: | |
1463 case SOF5: | |
1464 case SOF6: | |
1465 case SOF7: | |
1466 case SOF9: | |
1467 case SOF10: | |
1468 case SOF11: | |
1469 case SOF13: | |
1470 case SOF14: | |
1471 case SOF15: | |
1472 case JPG: | |
1473 av_log(avctx, AV_LOG_ERROR, "mjpeg: unsupported coding type (%x)\n", start_code); | |
1474 break; | |
1475 // default: | |
1476 // printf("mjpeg: unsupported marker (%x)\n", start_code); | |
1477 // break; | |
1478 } | |
1479 | |
1480 not_the_end: | |
1481 /* eof process start code */ | |
1482 buf_ptr += (get_bits_count(&s->gb)+7)/8; | |
1483 av_log(avctx, AV_LOG_DEBUG, "marker parser used %d bytes (%d bits)\n", | |
1484 (get_bits_count(&s->gb)+7)/8, get_bits_count(&s->gb)); | |
1485 } | |
1486 } | |
1487 } | |
1488 the_end: | |
5153 | 1489 av_log(avctx, AV_LOG_DEBUG, "mjpeg decode frame unused %td bytes\n", buf_end - buf_ptr); |
5020 | 1490 // return buf_end - buf_ptr; |
1491 return buf_ptr - buf; | |
1492 } | |
1493 | |
6517
48759bfbd073
Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents:
6448
diff
changeset
|
1494 av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) |
5020 | 1495 { |
1496 MJpegDecodeContext *s = avctx->priv_data; | |
1497 int i, j; | |
1498 | |
1499 av_free(s->buffer); | |
1500 av_free(s->qscale_table); | |
1501 | |
1502 for(i=0;i<2;i++) { | |
1503 for(j=0;j<4;j++) | |
1504 free_vlc(&s->vlcs[i][j]); | |
1505 } | |
8287 | 1506 for(i=0; i<MAX_COMPONENTS; i++) { |
1507 av_freep(&s->blocks[i]); | |
1508 av_freep(&s->last_nnz[i]); | |
1509 } | |
5020 | 1510 return 0; |
1511 } | |
1512 | |
1513 AVCodec mjpeg_decoder = { | |
1514 "mjpeg", | |
1515 CODEC_TYPE_VIDEO, | |
1516 CODEC_ID_MJPEG, | |
1517 sizeof(MJpegDecodeContext), | |
5041 | 1518 ff_mjpeg_decode_init, |
5020 | 1519 NULL, |
5041 | 1520 ff_mjpeg_decode_end, |
1521 ff_mjpeg_decode_frame, | |
5020 | 1522 CODEC_CAP_DR1, |
6710 | 1523 NULL, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6710
diff
changeset
|
1524 .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"), |
5020 | 1525 }; |
1526 | |
1527 AVCodec thp_decoder = { | |
1528 "thp", | |
1529 CODEC_TYPE_VIDEO, | |
1530 CODEC_ID_THP, | |
1531 sizeof(MJpegDecodeContext), | |
5041 | 1532 ff_mjpeg_decode_init, |
5020 | 1533 NULL, |
5041 | 1534 ff_mjpeg_decode_end, |
1535 ff_mjpeg_decode_frame, | |
5020 | 1536 CODEC_CAP_DR1, |
6710 | 1537 NULL, |
7040
e943e1409077
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents:
6710
diff
changeset
|
1538 .long_name = NULL_IF_CONFIG_SMALL("Nintendo Gamecube THP video"), |
5020 | 1539 }; |