Mercurial > libavcodec.hg
annotate vp3.c @ 1272:777d4145cdfb libavcodec
fix subtle logic problem in block unpacker that leads to incorrect token
decoding which leads to segfaults
author | tmmm |
---|---|
date | Mon, 19 May 2003 01:22:46 +0000 |
parents | a02df1ba6c7f |
children | 8988af3ae1e8 |
rev | line source |
---|---|
1224 | 1 /* |
2 * | |
3 * Copyright (C) 2003 the ffmpeg project | |
4 * | |
5 * This library is free software; you can redistribute it and/or | |
6 * modify it under the terms of the GNU Lesser General Public | |
7 * License as published by the Free Software Foundation; either | |
8 * version 2 of the License, or (at your option) any later version. | |
9 * | |
10 * This library is distributed in the hope that it will be useful, | |
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 * Lesser General Public License for more details. | |
14 * | |
15 * You should have received a copy of the GNU Lesser General Public | |
16 * License along with this library; if not, write to the Free Software | |
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 * | |
19 * VP3 Video Decoder by Mike Melanson (melanson@pcisys.net) | |
20 * | |
21 */ | |
22 | |
23 /** | |
24 * @file vp3.c | |
25 * On2 VP3 Video Decoder | |
26 */ | |
27 | |
28 #include <stdio.h> | |
29 #include <stdlib.h> | |
30 #include <string.h> | |
31 #include <unistd.h> | |
32 | |
33 #include "common.h" | |
34 #include "avcodec.h" | |
35 #include "dsputil.h" | |
36 #include "mpegvideo.h" | |
37 #include "dsputil.h" | |
38 #include "bswap.h" | |
39 | |
40 #include "vp3data.h" | |
41 | |
42 #define FRAGMENT_PIXELS 8 | |
43 | |
44 /* | |
45 * Debugging Variables | |
46 * | |
47 * Define one or more of the following compile-time variables to 1 to obtain | |
48 * elaborate information about certain aspects of the decoding process. | |
49 * | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
50 * KEYFRAMES_ONLY: set this to 1 to only see keyframes (VP3 slideshow mode) |
1224 | 51 * DEBUG_VP3: high-level decoding flow |
52 * DEBUG_INIT: initialization parameters | |
53 * DEBUG_DEQUANTIZERS: display how the dequanization tables are built | |
54 * DEBUG_BLOCK_CODING: unpacking the superblock/macroblock/fragment coding | |
55 * DEBUG_MODES: unpacking the coding modes for individual fragments | |
56 * DEBUG_VECTORS: display the motion vectors | |
57 * DEBUG_TOKEN: display exhaustive information about each DCT token | |
58 * DEBUG_VLC: display the VLCs as they are extracted from the stream | |
59 * DEBUG_DC_PRED: display the process of reversing DC prediction | |
60 * DEBUG_IDCT: show every detail of the IDCT process | |
61 */ | |
62 | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
63 #define KEYFRAMES_ONLY 0 |
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
64 |
1224 | 65 #define DEBUG_VP3 0 |
66 #define DEBUG_INIT 0 | |
67 #define DEBUG_DEQUANTIZERS 0 | |
68 #define DEBUG_BLOCK_CODING 0 | |
69 #define DEBUG_MODES 0 | |
70 #define DEBUG_VECTORS 0 | |
71 #define DEBUG_TOKEN 0 | |
72 #define DEBUG_VLC 0 | |
73 #define DEBUG_DC_PRED 0 | |
74 #define DEBUG_IDCT 0 | |
75 | |
76 #if DEBUG_VP3 | |
77 #define debug_vp3 printf | |
78 #else | |
79 static inline void debug_vp3(const char *format, ...) { } | |
80 #endif | |
81 | |
82 #if DEBUG_INIT | |
83 #define debug_init printf | |
84 #else | |
85 static inline void debug_init(const char *format, ...) { } | |
86 #endif | |
87 | |
88 #if DEBUG_DEQUANTIZERS | |
89 #define debug_dequantizers printf | |
90 #else | |
91 static inline void debug_dequantizers(const char *format, ...) { } | |
92 #endif | |
93 | |
94 #if DEBUG_BLOCK_CODING | |
95 #define debug_block_coding printf | |
96 #else | |
97 static inline void debug_block_coding(const char *format, ...) { } | |
98 #endif | |
99 | |
100 #if DEBUG_MODES | |
101 #define debug_modes printf | |
102 #else | |
103 static inline void debug_modes(const char *format, ...) { } | |
104 #endif | |
105 | |
106 #if DEBUG_VECTORS | |
107 #define debug_vectors printf | |
108 #else | |
109 static inline void debug_vectors(const char *format, ...) { } | |
110 #endif | |
111 | |
112 #if DEBUG_TOKEN | |
113 #define debug_token printf | |
114 #else | |
115 static inline void debug_token(const char *format, ...) { } | |
116 #endif | |
117 | |
118 #if DEBUG_VLC | |
119 #define debug_vlc printf | |
120 #else | |
121 static inline void debug_vlc(const char *format, ...) { } | |
122 #endif | |
123 | |
124 #if DEBUG_DC_PRED | |
125 #define debug_dc_pred printf | |
126 #else | |
127 static inline void debug_dc_pred(const char *format, ...) { } | |
128 #endif | |
129 | |
130 #if DEBUG_IDCT | |
131 #define debug_idct printf | |
132 #else | |
133 static inline void debug_idct(const char *format, ...) { } | |
134 #endif | |
135 | |
136 typedef struct Vp3Fragment { | |
137 DCTELEM coeffs[64]; | |
138 int coding_method; | |
139 int coeff_count; | |
140 int last_coeff; | |
141 int motion_x; | |
142 int motion_y; | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
143 /* this indicates which ffmpeg put_pixels() function to use: |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
144 * 00b = no halfpel, 01b = x halfpel, 10b = y halfpel, 11b = both halfpel */ |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
145 int motion_halfpel_index; |
1224 | 146 /* address of first pixel taking into account which plane the fragment |
147 * lives on as well as the plane stride */ | |
148 int first_pixel; | |
149 /* this is the macroblock that the fragment belongs to */ | |
150 int macroblock; | |
151 } Vp3Fragment; | |
152 | |
153 #define SB_NOT_CODED 0 | |
154 #define SB_PARTIALLY_CODED 1 | |
155 #define SB_FULLY_CODED 2 | |
156 | |
157 #define MODE_INTER_NO_MV 0 | |
158 #define MODE_INTRA 1 | |
159 #define MODE_INTER_PLUS_MV 2 | |
160 #define MODE_INTER_LAST_MV 3 | |
161 #define MODE_INTER_PRIOR_LAST 4 | |
162 #define MODE_USING_GOLDEN 5 | |
163 #define MODE_GOLDEN_MV 6 | |
164 #define MODE_INTER_FOURMV 7 | |
165 #define CODING_MODE_COUNT 8 | |
166 | |
167 /* special internal mode */ | |
168 #define MODE_COPY 8 | |
169 | |
170 /* There are 6 preset schemes, plus a free-form scheme */ | |
171 static int ModeAlphabet[7][CODING_MODE_COUNT] = | |
172 { | |
173 /* this is the custom scheme */ | |
174 { 0, 0, 0, 0, 0, 0, 0, 0 }, | |
175 | |
176 /* scheme 1: Last motion vector dominates */ | |
177 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, | |
178 MODE_INTER_PLUS_MV, MODE_INTER_NO_MV, | |
179 MODE_INTRA, MODE_USING_GOLDEN, | |
180 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
181 | |
182 /* scheme 2 */ | |
183 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, | |
184 MODE_INTER_NO_MV, MODE_INTER_PLUS_MV, | |
185 MODE_INTRA, MODE_USING_GOLDEN, | |
186 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
187 | |
188 /* scheme 3 */ | |
189 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV, | |
190 MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV, | |
191 MODE_INTRA, MODE_USING_GOLDEN, | |
192 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
193 | |
194 /* scheme 4 */ | |
195 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV, | |
196 MODE_INTER_NO_MV, MODE_INTER_PRIOR_LAST, | |
197 MODE_INTRA, MODE_USING_GOLDEN, | |
198 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
199 | |
200 /* scheme 5: No motion vector dominates */ | |
201 { MODE_INTER_NO_MV, MODE_INTER_LAST_MV, | |
202 MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV, | |
203 MODE_INTRA, MODE_USING_GOLDEN, | |
204 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
205 | |
206 /* scheme 6 */ | |
207 { MODE_INTER_NO_MV, MODE_USING_GOLDEN, | |
208 MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, | |
209 MODE_INTER_PLUS_MV, MODE_INTRA, | |
210 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
211 | |
212 }; | |
213 | |
214 #define MIN_DEQUANT_VAL 2 | |
215 | |
216 typedef struct Vp3DecodeContext { | |
217 AVCodecContext *avctx; | |
218 int width, height; | |
219 AVFrame golden_frame; | |
220 AVFrame last_frame; | |
221 AVFrame current_frame; | |
222 int keyframe; | |
223 DSPContext dsp; | |
224 | |
225 int quality_index; | |
226 int last_quality_index; | |
227 | |
228 int superblock_count; | |
229 int superblock_width; | |
230 int superblock_height; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
231 int y_superblock_width; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
232 int y_superblock_height; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
233 int c_superblock_width; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
234 int c_superblock_height; |
1224 | 235 int u_superblock_start; |
236 int v_superblock_start; | |
237 unsigned char *superblock_coding; | |
238 | |
239 int macroblock_count; | |
240 int macroblock_width; | |
241 int macroblock_height; | |
242 | |
243 int fragment_count; | |
244 int fragment_width; | |
245 int fragment_height; | |
246 | |
247 Vp3Fragment *all_fragments; | |
248 int u_fragment_start; | |
249 int v_fragment_start; | |
250 | |
251 /* this is a list of indices into the all_fragments array indicating | |
252 * which of the fragments are coded */ | |
253 int *coded_fragment_list; | |
254 int coded_fragment_list_index; | |
255 int pixel_addresses_inited; | |
256 | |
257 VLC dc_vlc[16]; | |
258 VLC ac_vlc_1[16]; | |
259 VLC ac_vlc_2[16]; | |
260 VLC ac_vlc_3[16]; | |
261 VLC ac_vlc_4[16]; | |
262 | |
263 int16_t intra_y_dequant[64]; | |
264 int16_t intra_c_dequant[64]; | |
265 int16_t inter_dequant[64]; | |
266 | |
267 /* This table contains superblock_count * 16 entries. Each set of 16 | |
268 * numbers corresponds to the fragment indices 0..15 of the superblock. | |
269 * An entry will be -1 to indicate that no entry corresponds to that | |
270 * index. */ | |
271 int *superblock_fragments; | |
272 | |
273 /* This table contains superblock_count * 4 entries. Each set of 4 | |
274 * numbers corresponds to the macroblock indices 0..3 of the superblock. | |
275 * An entry will be -1 to indicate that no entry corresponds to that | |
276 * index. */ | |
277 int *superblock_macroblocks; | |
278 | |
279 /* This table contains macroblock_count * 6 entries. Each set of 6 | |
280 * numbers corresponds to the fragment indices 0..5 which comprise | |
281 * the macroblock (4 Y fragments and 2 C fragments). */ | |
282 int *macroblock_fragments; | |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
283 /* This is an array that indicates how a particular macroblock |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
284 * is coded. */ |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
285 unsigned char *macroblock_coding; |
1224 | 286 |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
287 int first_coded_y_fragment; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
288 int first_coded_c_fragment; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
289 int last_coded_y_fragment; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
290 int last_coded_c_fragment; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
291 |
1224 | 292 } Vp3DecodeContext; |
293 | |
294 /************************************************************************ | |
295 * VP3 specific functions | |
296 ************************************************************************/ | |
297 | |
298 /* | |
299 * This function sets up all of the various blocks mappings: | |
300 * superblocks <-> fragments, macroblocks <-> fragments, | |
301 * superblocks <-> macroblocks | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
302 * |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
303 * Returns 0 is successful; returns 1 if *anything* went wrong. |
1224 | 304 */ |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
305 static int init_block_mapping(Vp3DecodeContext *s) |
1224 | 306 { |
307 int i, j; | |
308 signed int hilbert_walk_y[16]; | |
309 signed int hilbert_walk_c[16]; | |
310 signed int hilbert_walk_mb[4]; | |
311 | |
312 int current_fragment = 0; | |
313 int current_width = 0; | |
314 int current_height = 0; | |
315 int right_edge = 0; | |
316 int bottom_edge = 0; | |
317 int superblock_row_inc = 0; | |
318 int *hilbert = NULL; | |
319 int mapping_index = 0; | |
320 | |
321 int current_macroblock; | |
322 int c_fragment; | |
323 | |
324 signed char travel_width[16] = { | |
325 1, 1, 0, -1, | |
326 0, 0, 1, 0, | |
327 1, 0, 1, 0, | |
328 0, -1, 0, 1 | |
329 }; | |
330 | |
331 signed char travel_height[16] = { | |
332 0, 0, 1, 0, | |
333 1, 1, 0, -1, | |
334 0, 1, 0, -1, | |
335 -1, 0, -1, 0 | |
336 }; | |
337 | |
338 signed char travel_width_mb[4] = { | |
339 1, 0, 1, 0 | |
340 }; | |
341 | |
342 signed char travel_height_mb[4] = { | |
343 0, 1, 0, -1 | |
344 }; | |
345 | |
346 debug_vp3(" vp3: initialize block mapping tables\n"); | |
347 | |
348 /* figure out hilbert pattern per these frame dimensions */ | |
349 hilbert_walk_y[0] = 1; | |
350 hilbert_walk_y[1] = 1; | |
351 hilbert_walk_y[2] = s->fragment_width; | |
352 hilbert_walk_y[3] = -1; | |
353 hilbert_walk_y[4] = s->fragment_width; | |
354 hilbert_walk_y[5] = s->fragment_width; | |
355 hilbert_walk_y[6] = 1; | |
356 hilbert_walk_y[7] = -s->fragment_width; | |
357 hilbert_walk_y[8] = 1; | |
358 hilbert_walk_y[9] = s->fragment_width; | |
359 hilbert_walk_y[10] = 1; | |
360 hilbert_walk_y[11] = -s->fragment_width; | |
361 hilbert_walk_y[12] = -s->fragment_width; | |
362 hilbert_walk_y[13] = -1; | |
363 hilbert_walk_y[14] = -s->fragment_width; | |
364 hilbert_walk_y[15] = 1; | |
365 | |
366 hilbert_walk_c[0] = 1; | |
367 hilbert_walk_c[1] = 1; | |
368 hilbert_walk_c[2] = s->fragment_width / 2; | |
369 hilbert_walk_c[3] = -1; | |
370 hilbert_walk_c[4] = s->fragment_width / 2; | |
371 hilbert_walk_c[5] = s->fragment_width / 2; | |
372 hilbert_walk_c[6] = 1; | |
373 hilbert_walk_c[7] = -s->fragment_width / 2; | |
374 hilbert_walk_c[8] = 1; | |
375 hilbert_walk_c[9] = s->fragment_width / 2; | |
376 hilbert_walk_c[10] = 1; | |
377 hilbert_walk_c[11] = -s->fragment_width / 2; | |
378 hilbert_walk_c[12] = -s->fragment_width / 2; | |
379 hilbert_walk_c[13] = -1; | |
380 hilbert_walk_c[14] = -s->fragment_width / 2; | |
381 hilbert_walk_c[15] = 1; | |
382 | |
383 hilbert_walk_mb[0] = 1; | |
384 hilbert_walk_mb[1] = s->macroblock_width; | |
385 hilbert_walk_mb[2] = 1; | |
386 hilbert_walk_mb[3] = -s->macroblock_width; | |
387 | |
388 /* iterate through each superblock (all planes) and map the fragments */ | |
389 for (i = 0; i < s->superblock_count; i++) { | |
390 debug_init(" superblock %d (u starts @ %d, v starts @ %d)\n", | |
391 i, s->u_superblock_start, s->v_superblock_start); | |
392 | |
393 /* time to re-assign the limits? */ | |
394 if (i == 0) { | |
395 | |
396 /* start of Y superblocks */ | |
397 right_edge = s->fragment_width; | |
398 bottom_edge = s->fragment_height; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
399 current_width = -1; |
1224 | 400 current_height = 0; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
401 superblock_row_inc = 3 * s->fragment_width - |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
402 (s->y_superblock_width * 4 - s->fragment_width); |
1224 | 403 hilbert = hilbert_walk_y; |
404 | |
405 /* the first operation for this variable is to advance by 1 */ | |
406 current_fragment = -1; | |
407 | |
408 } else if (i == s->u_superblock_start) { | |
409 | |
410 /* start of U superblocks */ | |
411 right_edge = s->fragment_width / 2; | |
412 bottom_edge = s->fragment_height / 2; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
413 current_width = -1; |
1224 | 414 current_height = 0; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
415 superblock_row_inc = 3 * (s->fragment_width / 2) - |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
416 (s->c_superblock_width * 4 - s->fragment_width / 2); |
1224 | 417 hilbert = hilbert_walk_c; |
418 | |
419 /* the first operation for this variable is to advance by 1 */ | |
420 current_fragment = s->u_fragment_start - 1; | |
421 | |
422 } else if (i == s->v_superblock_start) { | |
423 | |
424 /* start of V superblocks */ | |
425 right_edge = s->fragment_width / 2; | |
426 bottom_edge = s->fragment_height / 2; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
427 current_width = -1; |
1224 | 428 current_height = 0; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
429 superblock_row_inc = 3 * (s->fragment_width / 2) - |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
430 (s->c_superblock_width * 4 - s->fragment_width / 2); |
1224 | 431 hilbert = hilbert_walk_c; |
432 | |
433 /* the first operation for this variable is to advance by 1 */ | |
434 current_fragment = s->v_fragment_start - 1; | |
435 | |
436 } | |
437 | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
438 if (current_width >= right_edge - 1) { |
1224 | 439 /* reset width and move to next superblock row */ |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
440 current_width = -1; |
1224 | 441 current_height += 4; |
442 | |
443 /* fragment is now at the start of a new superblock row */ | |
444 current_fragment += superblock_row_inc; | |
445 } | |
446 | |
447 /* iterate through all 16 fragments in a superblock */ | |
448 for (j = 0; j < 16; j++) { | |
449 current_fragment += hilbert[j]; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
450 current_width += travel_width[j]; |
1224 | 451 current_height += travel_height[j]; |
452 | |
453 /* check if the fragment is in bounds */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
454 if ((current_width < right_edge) && |
1224 | 455 (current_height < bottom_edge)) { |
456 s->superblock_fragments[mapping_index] = current_fragment; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
457 debug_init(" mapping fragment %d to superblock %d, position %d (%d/%d x %d/%d)\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
458 s->superblock_fragments[mapping_index], i, j, |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
459 current_width, right_edge, current_height, bottom_edge); |
1224 | 460 } else { |
461 s->superblock_fragments[mapping_index] = -1; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
462 debug_init(" superblock %d, position %d has no fragment (%d/%d x %d/%d)\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
463 i, j, |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
464 current_width, right_edge, current_height, bottom_edge); |
1224 | 465 } |
466 | |
467 mapping_index++; | |
468 } | |
469 } | |
470 | |
471 /* initialize the superblock <-> macroblock mapping; iterate through | |
472 * all of the Y plane superblocks to build this mapping */ | |
473 right_edge = s->macroblock_width; | |
474 bottom_edge = s->macroblock_height; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
475 current_width = -1; |
1224 | 476 current_height = 0; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
477 superblock_row_inc = s->macroblock_width - |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
478 (s->y_superblock_width * 2 - s->macroblock_width);; |
1224 | 479 hilbert = hilbert_walk_mb; |
480 mapping_index = 0; | |
481 current_macroblock = -1; | |
482 for (i = 0; i < s->u_superblock_start; i++) { | |
483 | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
484 if (current_width >= right_edge - 1) { |
1224 | 485 /* reset width and move to next superblock row */ |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
486 current_width = -1; |
1224 | 487 current_height += 2; |
488 | |
489 /* macroblock is now at the start of a new superblock row */ | |
490 current_macroblock += superblock_row_inc; | |
491 } | |
492 | |
493 /* iterate through each potential macroblock in the superblock */ | |
494 for (j = 0; j < 4; j++) { | |
495 current_macroblock += hilbert_walk_mb[j]; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
496 current_width += travel_width_mb[j]; |
1224 | 497 current_height += travel_height_mb[j]; |
498 | |
499 /* check if the macroblock is in bounds */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
500 if ((current_width < right_edge) && |
1224 | 501 (current_height < bottom_edge)) { |
502 s->superblock_macroblocks[mapping_index] = current_macroblock; | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
503 debug_init(" mapping macroblock %d to superblock %d, position %d (%d/%d x %d/%d)\n", |
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
504 s->superblock_macroblocks[mapping_index], i, j, |
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
505 current_width, right_edge, current_height, bottom_edge); |
1224 | 506 } else { |
507 s->superblock_macroblocks[mapping_index] = -1; | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
508 debug_init(" superblock %d, position %d has no macroblock (%d/%d x %d/%d)\n", |
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
509 i, j, |
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
510 current_width, right_edge, current_height, bottom_edge); |
1224 | 511 } |
512 | |
513 mapping_index++; | |
514 } | |
515 } | |
516 | |
517 /* initialize the macroblock <-> fragment mapping */ | |
518 current_fragment = 0; | |
519 current_macroblock = 0; | |
520 mapping_index = 0; | |
521 for (i = 0; i < s->fragment_height; i += 2) { | |
522 | |
523 for (j = 0; j < s->fragment_width; j += 2) { | |
524 | |
525 debug_init(" macroblock %d contains fragments: ", current_macroblock); | |
526 s->all_fragments[current_fragment].macroblock = current_macroblock; | |
527 s->macroblock_fragments[mapping_index++] = current_fragment; | |
528 debug_init("%d ", current_fragment); | |
529 | |
530 if (j + 1 < s->fragment_width) { | |
531 s->all_fragments[current_fragment + 1].macroblock = current_macroblock; | |
532 s->macroblock_fragments[mapping_index++] = current_fragment + 1; | |
533 debug_init("%d ", current_fragment + 1); | |
534 } else | |
535 s->macroblock_fragments[mapping_index++] = -1; | |
536 | |
537 if (i + 1 < s->fragment_height) { | |
538 s->all_fragments[current_fragment + s->fragment_width].macroblock = | |
539 current_macroblock; | |
540 s->macroblock_fragments[mapping_index++] = | |
541 current_fragment + s->fragment_width; | |
542 debug_init("%d ", current_fragment + s->fragment_width); | |
543 } else | |
544 s->macroblock_fragments[mapping_index++] = -1; | |
545 | |
546 if ((j + 1 < s->fragment_width) && (i + 1 < s->fragment_height)) { | |
547 s->all_fragments[current_fragment + s->fragment_width + 1].macroblock = | |
548 current_macroblock; | |
549 s->macroblock_fragments[mapping_index++] = | |
550 current_fragment + s->fragment_width + 1; | |
551 debug_init("%d ", current_fragment + s->fragment_width + 1); | |
552 } else | |
553 s->macroblock_fragments[mapping_index++] = -1; | |
554 | |
555 /* C planes */ | |
556 c_fragment = s->u_fragment_start + | |
557 (i * s->fragment_width / 4) + (j / 2); | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
558 s->all_fragments[c_fragment].macroblock = s->macroblock_count; |
1224 | 559 s->macroblock_fragments[mapping_index++] = c_fragment; |
560 debug_init("%d ", c_fragment); | |
561 | |
562 c_fragment = s->v_fragment_start + | |
563 (i * s->fragment_width / 4) + (j / 2); | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
564 s->all_fragments[c_fragment].macroblock = s->macroblock_count; |
1224 | 565 s->macroblock_fragments[mapping_index++] = c_fragment; |
566 debug_init("%d ", c_fragment); | |
567 | |
568 debug_init("\n"); | |
569 | |
570 if (j + 2 <= s->fragment_width) | |
571 current_fragment += 2; | |
572 else | |
573 current_fragment++; | |
574 current_macroblock++; | |
575 } | |
576 | |
577 current_fragment += s->fragment_width; | |
578 } | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
579 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
580 return 0; /* successful path out */ |
1224 | 581 } |
582 | |
583 /* | |
584 * This function unpacks a single token (which should be in the range 0..31) | |
585 * and returns a zero run (number of zero coefficients in current DCT matrix | |
586 * before next non-zero coefficient), the next DCT coefficient, and the | |
587 * number of consecutive, non-EOB'd DCT blocks to EOB. | |
588 */ | |
589 static void unpack_token(GetBitContext *gb, int token, int *zero_run, | |
590 DCTELEM *coeff, int *eob_run) | |
591 { | |
592 int sign; | |
593 | |
594 *zero_run = 0; | |
595 *eob_run = 0; | |
596 *coeff = 0; | |
597 | |
598 debug_token(" vp3 token %d: ", token); | |
599 switch (token) { | |
600 | |
601 case 0: | |
602 debug_token("DCT_EOB_TOKEN, EOB next block\n"); | |
603 *eob_run = 1; | |
604 break; | |
605 | |
606 case 1: | |
607 debug_token("DCT_EOB_PAIR_TOKEN, EOB next 2 blocks\n"); | |
608 *eob_run = 2; | |
609 break; | |
610 | |
611 case 2: | |
612 debug_token("DCT_EOB_TRIPLE_TOKEN, EOB next 3 blocks\n"); | |
613 *eob_run = 3; | |
614 break; | |
615 | |
616 case 3: | |
617 debug_token("DCT_REPEAT_RUN_TOKEN, "); | |
618 *eob_run = get_bits(gb, 2) + 4; | |
619 debug_token("EOB the next %d blocks\n", *eob_run); | |
620 break; | |
621 | |
622 case 4: | |
623 debug_token("DCT_REPEAT_RUN2_TOKEN, "); | |
624 *eob_run = get_bits(gb, 3) + 8; | |
625 debug_token("EOB the next %d blocks\n", *eob_run); | |
626 break; | |
627 | |
628 case 5: | |
629 debug_token("DCT_REPEAT_RUN3_TOKEN, "); | |
630 *eob_run = get_bits(gb, 4) + 16; | |
631 debug_token("EOB the next %d blocks\n", *eob_run); | |
632 break; | |
633 | |
634 case 6: | |
635 debug_token("DCT_REPEAT_RUN4_TOKEN, "); | |
636 *eob_run = get_bits(gb, 12); | |
637 debug_token("EOB the next %d blocks\n", *eob_run); | |
638 break; | |
639 | |
640 case 7: | |
641 debug_token("DCT_SHORT_ZRL_TOKEN, "); | |
642 /* note that this token actually indicates that (3 extra bits) + 1 0s | |
643 * should be output; this case specifies a run of (3 EBs) 0s and a | |
644 * coefficient of 0. */ | |
645 *zero_run = get_bits(gb, 3); | |
646 *coeff = 0; | |
647 debug_token("skip the next %d positions in output matrix\n", *zero_run + 1); | |
648 break; | |
649 | |
650 case 8: | |
651 debug_token("DCT_ZRL_TOKEN, "); | |
652 /* note that this token actually indicates that (6 extra bits) + 1 0s | |
653 * should be output; this case specifies a run of (6 EBs) 0s and a | |
654 * coefficient of 0. */ | |
655 *zero_run = get_bits(gb, 6); | |
656 *coeff = 0; | |
657 debug_token("skip the next %d positions in output matrix\n", *zero_run + 1); | |
658 break; | |
659 | |
660 case 9: | |
661 debug_token("ONE_TOKEN, output 1\n"); | |
662 *coeff = 1; | |
663 break; | |
664 | |
665 case 10: | |
666 debug_token("MINUS_ONE_TOKEN, output -1\n"); | |
667 *coeff = -1; | |
668 break; | |
669 | |
670 case 11: | |
671 debug_token("TWO_TOKEN, output 2\n"); | |
672 *coeff = 2; | |
673 break; | |
674 | |
675 case 12: | |
676 debug_token("MINUS_TWO_TOKEN, output -2\n"); | |
677 *coeff = -2; | |
678 break; | |
679 | |
680 case 13: | |
681 case 14: | |
682 case 15: | |
683 case 16: | |
684 debug_token("LOW_VAL_TOKENS, "); | |
685 if (get_bits(gb, 1)) | |
686 *coeff = -(3 + (token - 13)); | |
687 else | |
688 *coeff = 3 + (token - 13); | |
689 debug_token("output %d\n", *coeff); | |
690 break; | |
691 | |
692 case 17: | |
693 debug_token("DCT_VAL_CATEGORY3, "); | |
694 sign = get_bits(gb, 1); | |
695 *coeff = 7 + get_bits(gb, 1); | |
696 if (sign) | |
697 *coeff = -(*coeff); | |
698 debug_token("output %d\n", *coeff); | |
699 break; | |
700 | |
701 case 18: | |
702 debug_token("DCT_VAL_CATEGORY4, "); | |
703 sign = get_bits(gb, 1); | |
704 *coeff = 9 + get_bits(gb, 2); | |
705 if (sign) | |
706 *coeff = -(*coeff); | |
707 debug_token("output %d\n", *coeff); | |
708 break; | |
709 | |
710 case 19: | |
711 debug_token("DCT_VAL_CATEGORY5, "); | |
712 sign = get_bits(gb, 1); | |
713 *coeff = 13 + get_bits(gb, 3); | |
714 if (sign) | |
715 *coeff = -(*coeff); | |
716 debug_token("output %d\n", *coeff); | |
717 break; | |
718 | |
719 case 20: | |
720 debug_token("DCT_VAL_CATEGORY6, "); | |
721 sign = get_bits(gb, 1); | |
722 *coeff = 21 + get_bits(gb, 4); | |
723 if (sign) | |
724 *coeff = -(*coeff); | |
725 debug_token("output %d\n", *coeff); | |
726 break; | |
727 | |
728 case 21: | |
729 debug_token("DCT_VAL_CATEGORY7, "); | |
730 sign = get_bits(gb, 1); | |
731 *coeff = 37 + get_bits(gb, 5); | |
732 if (sign) | |
733 *coeff = -(*coeff); | |
734 debug_token("output %d\n", *coeff); | |
735 break; | |
736 | |
737 case 22: | |
738 debug_token("DCT_VAL_CATEGORY8, "); | |
739 sign = get_bits(gb, 1); | |
740 *coeff = 69 + get_bits(gb, 9); | |
741 if (sign) | |
742 *coeff = -(*coeff); | |
743 debug_token("output %d\n", *coeff); | |
744 break; | |
745 | |
746 case 23: | |
747 case 24: | |
748 case 25: | |
749 case 26: | |
750 case 27: | |
751 debug_token("DCT_RUN_CATEGORY1, "); | |
752 *zero_run = token - 22; | |
753 if (get_bits(gb, 1)) | |
754 *coeff = -1; | |
755 else | |
756 *coeff = 1; | |
757 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
758 break; | |
759 | |
760 case 28: | |
761 debug_token("DCT_RUN_CATEGORY1B, "); | |
762 if (get_bits(gb, 1)) | |
763 *coeff = -1; | |
764 else | |
765 *coeff = 1; | |
766 *zero_run = 6 + get_bits(gb, 2); | |
767 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
768 break; | |
769 | |
770 case 29: | |
771 debug_token("DCT_RUN_CATEGORY1C, "); | |
772 if (get_bits(gb, 1)) | |
773 *coeff = -1; | |
774 else | |
775 *coeff = 1; | |
776 *zero_run = 10 + get_bits(gb, 3); | |
777 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
778 break; | |
779 | |
780 case 30: | |
781 debug_token("DCT_RUN_CATEGORY2, "); | |
782 sign = get_bits(gb, 1); | |
783 *coeff = 2 + get_bits(gb, 1); | |
784 if (sign) | |
785 *coeff = -(*coeff); | |
786 *zero_run = 1; | |
787 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
788 break; | |
789 | |
790 case 31: | |
791 debug_token("DCT_RUN_CATEGORY2, "); | |
792 sign = get_bits(gb, 1); | |
793 *coeff = 2 + get_bits(gb, 1); | |
794 if (sign) | |
795 *coeff = -(*coeff); | |
796 *zero_run = 2 + get_bits(gb, 1); | |
797 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
798 break; | |
799 | |
800 default: | |
801 printf (" vp3: help! Got a bad token: %d > 31\n", token); | |
802 break; | |
803 | |
804 } | |
805 } | |
806 | |
807 /* | |
808 * This function wipes out all of the fragment data. | |
809 */ | |
810 static void init_frame(Vp3DecodeContext *s, GetBitContext *gb) | |
811 { | |
812 int i; | |
813 | |
814 /* zero out all of the fragment information */ | |
815 s->coded_fragment_list_index = 0; | |
816 for (i = 0; i < s->fragment_count; i++) { | |
817 memset(s->all_fragments[i].coeffs, 0, 64 * sizeof(DCTELEM)); | |
818 s->all_fragments[i].coeff_count = 0; | |
819 s->all_fragments[i].last_coeff = 0; | |
820 } | |
821 } | |
822 | |
823 /* | |
824 * This function sets of the dequantization tables used for a particular | |
825 * frame. | |
826 */ | |
827 static void init_dequantizer(Vp3DecodeContext *s) | |
828 { | |
829 | |
830 int quality_scale = vp31_quality_threshold[s->quality_index]; | |
831 int dc_scale_factor = vp31_dc_scale_factor[s->quality_index]; | |
832 int i, j; | |
833 | |
834 debug_vp3(" vp3: initializing dequantization tables\n"); | |
835 | |
836 /* | |
837 * Scale dequantizers: | |
838 * | |
839 * quantizer * sf | |
840 * -------------- | |
841 * 100 | |
842 * | |
843 * where sf = dc_scale_factor for DC quantizer | |
844 * or quality_scale for AC quantizer | |
845 * | |
846 * Then, saturate the result to a lower limit of MIN_DEQUANT_VAL. | |
847 */ | |
848 #define SCALER 1 | |
849 | |
850 /* scale DC quantizers */ | |
851 s->intra_y_dequant[0] = vp31_intra_y_dequant[0] * dc_scale_factor / 100; | |
852 if (s->intra_y_dequant[0] < MIN_DEQUANT_VAL * 2) | |
853 s->intra_y_dequant[0] = MIN_DEQUANT_VAL * 2; | |
854 s->intra_y_dequant[0] *= SCALER; | |
855 | |
856 s->intra_c_dequant[0] = vp31_intra_c_dequant[0] * dc_scale_factor / 100; | |
857 if (s->intra_c_dequant[0] < MIN_DEQUANT_VAL * 2) | |
858 s->intra_c_dequant[0] = MIN_DEQUANT_VAL * 2; | |
859 s->intra_c_dequant[0] *= SCALER; | |
860 | |
861 s->inter_dequant[0] = vp31_inter_dequant[0] * dc_scale_factor / 100; | |
862 if (s->inter_dequant[0] < MIN_DEQUANT_VAL * 4) | |
863 s->inter_dequant[0] = MIN_DEQUANT_VAL * 4; | |
864 s->inter_dequant[0] *= SCALER; | |
865 | |
866 /* scale AC quantizers, zigzag at the same time in preparation for | |
867 * the dequantization phase */ | |
868 for (i = 1; i < 64; i++) { | |
869 | |
1239 | 870 j = zigzag_index[i]; |
1224 | 871 |
872 s->intra_y_dequant[j] = vp31_intra_y_dequant[i] * quality_scale / 100; | |
873 if (s->intra_y_dequant[j] < MIN_DEQUANT_VAL) | |
874 s->intra_y_dequant[j] = MIN_DEQUANT_VAL; | |
875 s->intra_y_dequant[j] *= SCALER; | |
876 | |
877 s->intra_c_dequant[j] = vp31_intra_c_dequant[i] * quality_scale / 100; | |
878 if (s->intra_c_dequant[j] < MIN_DEQUANT_VAL) | |
879 s->intra_c_dequant[j] = MIN_DEQUANT_VAL; | |
880 s->intra_c_dequant[j] *= SCALER; | |
881 | |
882 s->inter_dequant[j] = vp31_inter_dequant[i] * quality_scale / 100; | |
883 if (s->inter_dequant[j] < MIN_DEQUANT_VAL * 2) | |
884 s->inter_dequant[j] = MIN_DEQUANT_VAL * 2; | |
885 s->inter_dequant[j] *= SCALER; | |
886 } | |
887 | |
888 /* print debug information as requested */ | |
889 debug_dequantizers("intra Y dequantizers:\n"); | |
890 for (i = 0; i < 8; i++) { | |
891 for (j = i * 8; j < i * 8 + 8; j++) { | |
892 debug_dequantizers(" %4d,", s->intra_y_dequant[j]); | |
893 } | |
894 debug_dequantizers("\n"); | |
895 } | |
896 debug_dequantizers("\n"); | |
897 | |
898 debug_dequantizers("intra C dequantizers:\n"); | |
899 for (i = 0; i < 8; i++) { | |
900 for (j = i * 8; j < i * 8 + 8; j++) { | |
901 debug_dequantizers(" %4d,", s->intra_c_dequant[j]); | |
902 } | |
903 debug_dequantizers("\n"); | |
904 } | |
905 debug_dequantizers("\n"); | |
906 | |
907 debug_dequantizers("interframe dequantizers:\n"); | |
908 for (i = 0; i < 8; i++) { | |
909 for (j = i * 8; j < i * 8 + 8; j++) { | |
910 debug_dequantizers(" %4d,", s->inter_dequant[j]); | |
911 } | |
912 debug_dequantizers("\n"); | |
913 } | |
914 debug_dequantizers("\n"); | |
915 } | |
916 | |
917 /* | |
918 * This function is used to fetch runs of 1s or 0s from the bitstream for | |
919 * use in determining which superblocks are fully and partially coded. | |
920 * | |
921 * Codeword RunLength | |
922 * 0 1 | |
923 * 10x 2-3 | |
924 * 110x 4-5 | |
925 * 1110xx 6-9 | |
926 * 11110xxx 10-17 | |
927 * 111110xxxx 18-33 | |
928 * 111111xxxxxxxxxxxx 34-4129 | |
929 */ | |
930 static int get_superblock_run_length(GetBitContext *gb) | |
931 { | |
932 | |
933 if (get_bits(gb, 1) == 0) | |
934 return 1; | |
935 | |
936 else if (get_bits(gb, 1) == 0) | |
937 return (2 + get_bits(gb, 1)); | |
938 | |
939 else if (get_bits(gb, 1) == 0) | |
940 return (4 + get_bits(gb, 1)); | |
941 | |
942 else if (get_bits(gb, 1) == 0) | |
943 return (6 + get_bits(gb, 2)); | |
944 | |
945 else if (get_bits(gb, 1) == 0) | |
946 return (10 + get_bits(gb, 3)); | |
947 | |
948 else if (get_bits(gb, 1) == 0) | |
949 return (18 + get_bits(gb, 4)); | |
950 | |
951 else | |
952 return (34 + get_bits(gb, 12)); | |
953 | |
954 } | |
955 | |
956 /* | |
957 * This function is used to fetch runs of 1s or 0s from the bitstream for | |
958 * use in determining which particular fragments are coded. | |
959 * | |
960 * Codeword RunLength | |
961 * 0x 1-2 | |
962 * 10x 3-4 | |
963 * 110x 5-6 | |
964 * 1110xx 7-10 | |
965 * 11110xx 11-14 | |
966 * 11111xxxx 15-30 | |
967 */ | |
968 static int get_fragment_run_length(GetBitContext *gb) | |
969 { | |
970 | |
971 if (get_bits(gb, 1) == 0) | |
972 return (1 + get_bits(gb, 1)); | |
973 | |
974 else if (get_bits(gb, 1) == 0) | |
975 return (3 + get_bits(gb, 1)); | |
976 | |
977 else if (get_bits(gb, 1) == 0) | |
978 return (5 + get_bits(gb, 1)); | |
979 | |
980 else if (get_bits(gb, 1) == 0) | |
981 return (7 + get_bits(gb, 2)); | |
982 | |
983 else if (get_bits(gb, 1) == 0) | |
984 return (11 + get_bits(gb, 2)); | |
985 | |
986 else | |
987 return (15 + get_bits(gb, 4)); | |
988 | |
989 } | |
990 | |
991 /* | |
992 * This function decodes a VLC from the bitstream and returns a number | |
993 * that ranges from 0..7. The number indicates which of the 8 coding | |
994 * modes to use. | |
995 * | |
996 * VLC Number | |
997 * 0 0 | |
998 * 10 1 | |
999 * 110 2 | |
1000 * 1110 3 | |
1001 * 11110 4 | |
1002 * 111110 5 | |
1003 * 1111110 6 | |
1004 * 1111111 7 | |
1005 * | |
1006 */ | |
1007 static int get_mode_code(GetBitContext *gb) | |
1008 { | |
1009 | |
1010 if (get_bits(gb, 1) == 0) | |
1011 return 0; | |
1012 | |
1013 else if (get_bits(gb, 1) == 0) | |
1014 return 1; | |
1015 | |
1016 else if (get_bits(gb, 1) == 0) | |
1017 return 2; | |
1018 | |
1019 else if (get_bits(gb, 1) == 0) | |
1020 return 3; | |
1021 | |
1022 else if (get_bits(gb, 1) == 0) | |
1023 return 4; | |
1024 | |
1025 else if (get_bits(gb, 1) == 0) | |
1026 return 5; | |
1027 | |
1028 else if (get_bits(gb, 1) == 0) | |
1029 return 6; | |
1030 | |
1031 else | |
1032 return 7; | |
1033 | |
1034 } | |
1035 | |
1036 /* | |
1037 * This function extracts a motion vector from the bitstream using a VLC | |
1038 * scheme. 3 bits are fetched from the bitstream and 1 of 8 actions is | |
1039 * taken depending on the value on those 3 bits: | |
1040 * | |
1041 * 0: return 0 | |
1042 * 1: return 1 | |
1043 * 2: return -1 | |
1044 * 3: if (next bit is 1) return -2, else return 2 | |
1045 * 4: if (next bit is 1) return -3, else return 3 | |
1046 * 5: return 4 + (next 2 bits), next bit is sign | |
1047 * 6: return 8 + (next 3 bits), next bit is sign | |
1048 * 7: return 16 + (next 4 bits), next bit is sign | |
1049 */ | |
1050 static int get_motion_vector_vlc(GetBitContext *gb) | |
1051 { | |
1052 int bits; | |
1053 | |
1054 bits = get_bits(gb, 3); | |
1055 | |
1056 switch(bits) { | |
1057 | |
1058 case 0: | |
1059 bits = 0; | |
1060 break; | |
1061 | |
1062 case 1: | |
1063 bits = 1; | |
1064 break; | |
1065 | |
1066 case 2: | |
1067 bits = -1; | |
1068 break; | |
1069 | |
1070 case 3: | |
1071 if (get_bits(gb, 1) == 0) | |
1072 bits = 2; | |
1073 else | |
1074 bits = -2; | |
1075 break; | |
1076 | |
1077 case 4: | |
1078 if (get_bits(gb, 1) == 0) | |
1079 bits = 3; | |
1080 else | |
1081 bits = -3; | |
1082 break; | |
1083 | |
1084 case 5: | |
1085 bits = 4 + get_bits(gb, 2); | |
1086 if (get_bits(gb, 1) == 1) | |
1087 bits = -bits; | |
1088 break; | |
1089 | |
1090 case 6: | |
1091 bits = 8 + get_bits(gb, 3); | |
1092 if (get_bits(gb, 1) == 1) | |
1093 bits = -bits; | |
1094 break; | |
1095 | |
1096 case 7: | |
1097 bits = 16 + get_bits(gb, 4); | |
1098 if (get_bits(gb, 1) == 1) | |
1099 bits = -bits; | |
1100 break; | |
1101 | |
1102 } | |
1103 | |
1104 return bits; | |
1105 } | |
1106 | |
1107 /* | |
1108 * This function fetches a 5-bit number from the stream followed by | |
1109 * a sign and calls it a motion vector. | |
1110 */ | |
1111 static int get_motion_vector_fixed(GetBitContext *gb) | |
1112 { | |
1113 | |
1114 int bits; | |
1115 | |
1116 bits = get_bits(gb, 5); | |
1117 | |
1118 if (get_bits(gb, 1) == 1) | |
1119 bits = -bits; | |
1120 | |
1121 return bits; | |
1122 } | |
1123 | |
1124 /* | |
1125 * This function unpacks all of the superblock/macroblock/fragment coding | |
1126 * information from the bitstream. | |
1127 */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1128 static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) |
1224 | 1129 { |
1130 int bit = 0; | |
1131 int current_superblock = 0; | |
1132 int current_run = 0; | |
1133 int decode_fully_flags = 0; | |
1134 int decode_partial_blocks = 0; | |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1135 int first_c_fragment_seen; |
1224 | 1136 |
1137 int i, j; | |
1138 int current_fragment; | |
1139 | |
1140 debug_vp3(" vp3: unpacking superblock coding\n"); | |
1141 | |
1142 if (s->keyframe) { | |
1143 | |
1144 debug_vp3(" keyframe-- all superblocks are fully coded\n"); | |
1145 memset(s->superblock_coding, SB_FULLY_CODED, s->superblock_count); | |
1146 | |
1147 } else { | |
1148 | |
1149 /* unpack the list of partially-coded superblocks */ | |
1150 bit = get_bits(gb, 1); | |
1151 /* toggle the bit because as soon as the first run length is | |
1152 * fetched the bit will be toggled again */ | |
1153 bit ^= 1; | |
1154 while (current_superblock < s->superblock_count) { | |
1155 if (current_run == 0) { | |
1156 bit ^= 1; | |
1157 current_run = get_superblock_run_length(gb); | |
1158 debug_block_coding(" setting superblocks %d..%d to %s\n", | |
1159 current_superblock, | |
1160 current_superblock + current_run - 1, | |
1161 (bit) ? "partially coded" : "not coded"); | |
1162 | |
1163 /* if any of the superblocks are not partially coded, flag | |
1164 * a boolean to decode the list of fully-coded superblocks */ | |
1165 if (bit == 0) | |
1166 decode_fully_flags = 1; | |
1167 } else { | |
1168 | |
1169 /* make a note of the fact that there are partially coded | |
1170 * superblocks */ | |
1171 decode_partial_blocks = 1; | |
1172 | |
1173 } | |
1174 s->superblock_coding[current_superblock++] = | |
1175 (bit) ? SB_PARTIALLY_CODED : SB_NOT_CODED; | |
1176 current_run--; | |
1177 } | |
1178 | |
1179 /* unpack the list of fully coded superblocks if any of the blocks were | |
1180 * not marked as partially coded in the previous step */ | |
1181 if (decode_fully_flags) { | |
1182 | |
1183 current_superblock = 0; | |
1184 current_run = 0; | |
1185 bit = get_bits(gb, 1); | |
1186 /* toggle the bit because as soon as the first run length is | |
1187 * fetched the bit will be toggled again */ | |
1188 bit ^= 1; | |
1189 while (current_superblock < s->superblock_count) { | |
1190 | |
1191 /* skip any superblocks already marked as partially coded */ | |
1192 if (s->superblock_coding[current_superblock] == SB_NOT_CODED) { | |
1193 | |
1194 if (current_run == 0) { | |
1195 bit ^= 1; | |
1196 current_run = get_superblock_run_length(gb); | |
1197 } | |
1198 | |
1199 debug_block_coding(" setting superblock %d to %s\n", | |
1200 current_superblock, | |
1201 (bit) ? "fully coded" : "not coded"); | |
1202 s->superblock_coding[current_superblock] = | |
1203 (bit) ? SB_FULLY_CODED : SB_NOT_CODED; | |
1204 current_run--; | |
1205 } | |
1206 current_superblock++; | |
1207 } | |
1208 } | |
1209 | |
1210 /* if there were partial blocks, initialize bitstream for | |
1211 * unpacking fragment codings */ | |
1212 if (decode_partial_blocks) { | |
1213 | |
1214 current_run = 0; | |
1215 bit = get_bits(gb, 1); | |
1216 /* toggle the bit because as soon as the first run length is | |
1217 * fetched the bit will be toggled again */ | |
1218 bit ^= 1; | |
1219 } | |
1220 } | |
1221 | |
1222 /* figure out which fragments are coded; iterate through each | |
1223 * superblock (all planes) */ | |
1224 s->coded_fragment_list_index = 0; | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1225 s->first_coded_y_fragment = s->first_coded_c_fragment = 0; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1226 s->last_coded_y_fragment = s->last_coded_c_fragment = -1; |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1227 first_c_fragment_seen = 0; |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1228 memset(s->macroblock_coding, MODE_COPY, s->macroblock_count); |
1224 | 1229 for (i = 0; i < s->superblock_count; i++) { |
1230 | |
1231 /* iterate through all 16 fragments in a superblock */ | |
1232 for (j = 0; j < 16; j++) { | |
1233 | |
1234 /* if the fragment is in bounds, check its coding status */ | |
1235 current_fragment = s->superblock_fragments[i * 16 + j]; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1236 if (current_fragment >= s->fragment_count) { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1237 printf (" vp3:unpack_superblocks(): bad fragment number (%d >= %d)\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1238 current_fragment, s->fragment_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1239 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1240 } |
1224 | 1241 if (current_fragment != -1) { |
1242 if (s->superblock_coding[i] == SB_NOT_CODED) { | |
1243 | |
1244 /* copy all the fragments from the prior frame */ | |
1245 s->all_fragments[current_fragment].coding_method = | |
1246 MODE_COPY; | |
1247 | |
1248 } else if (s->superblock_coding[i] == SB_PARTIALLY_CODED) { | |
1249 | |
1250 /* fragment may or may not be coded; this is the case | |
1251 * that cares about the fragment coding runs */ | |
1252 if (current_run == 0) { | |
1253 bit ^= 1; | |
1254 current_run = get_fragment_run_length(gb); | |
1255 } | |
1256 | |
1257 if (bit) { | |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1258 /* default mode; actual mode will be decoded in |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1259 * the next phase */ |
1224 | 1260 s->all_fragments[current_fragment].coding_method = |
1261 MODE_INTER_NO_MV; | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1262 s->coded_fragment_list[s->coded_fragment_list_index] = |
1224 | 1263 current_fragment; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1264 if ((current_fragment >= s->u_fragment_start) && |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1265 (s->last_coded_y_fragment == -1) && |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1266 (!first_c_fragment_seen)) { |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1267 s->first_coded_c_fragment = s->coded_fragment_list_index; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1268 s->last_coded_y_fragment = s->first_coded_c_fragment - 1; |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1269 first_c_fragment_seen = 1; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1270 } |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1271 s->coded_fragment_list_index++; |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1272 s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV; |
1224 | 1273 debug_block_coding(" superblock %d is partially coded, fragment %d is coded\n", |
1274 i, current_fragment); | |
1275 } else { | |
1276 /* not coded; copy this fragment from the prior frame */ | |
1277 s->all_fragments[current_fragment].coding_method = | |
1278 MODE_COPY; | |
1279 debug_block_coding(" superblock %d is partially coded, fragment %d is not coded\n", | |
1280 i, current_fragment); | |
1281 } | |
1282 | |
1283 current_run--; | |
1284 | |
1285 } else { | |
1286 | |
1287 /* fragments are fully coded in this superblock; actual | |
1288 * coding will be determined in next step */ | |
1289 s->all_fragments[current_fragment].coding_method = | |
1290 MODE_INTER_NO_MV; | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1291 s->coded_fragment_list[s->coded_fragment_list_index] = |
1224 | 1292 current_fragment; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1293 if ((current_fragment >= s->u_fragment_start) && |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1294 (s->last_coded_y_fragment == -1) && |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1295 (!first_c_fragment_seen)) { |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1296 s->first_coded_c_fragment = s->coded_fragment_list_index; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1297 s->last_coded_y_fragment = s->first_coded_c_fragment - 1; |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1298 first_c_fragment_seen = 1; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1299 } |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1300 s->coded_fragment_list_index++; |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1301 s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV; |
1224 | 1302 debug_block_coding(" superblock %d is fully coded, fragment %d is coded\n", |
1303 i, current_fragment); | |
1304 } | |
1305 } | |
1306 } | |
1307 } | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1308 |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1309 if (!first_c_fragment_seen) |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1310 /* only Y fragments coded in this frame */ |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1311 s->last_coded_y_fragment = s->coded_fragment_list_index - 1; |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1312 else |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1313 /* end the list of coded fragments */ |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1314 s->last_coded_c_fragment = s->coded_fragment_list_index - 1; |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1315 |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1316 debug_block_coding(" %d total coded fragments, y: %d -> %d, c: %d -> %d\n", |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1317 s->coded_fragment_list_index, |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1318 s->first_coded_y_fragment, |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1319 s->last_coded_y_fragment, |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1320 s->first_coded_c_fragment, |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1321 s->last_coded_c_fragment); |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1322 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1323 return 0; |
1224 | 1324 } |
1325 | |
1326 /* | |
1327 * This function unpacks all the coding mode data for individual macroblocks | |
1328 * from the bitstream. | |
1329 */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1330 static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb) |
1224 | 1331 { |
1332 int i, j, k; | |
1333 int scheme; | |
1334 int current_macroblock; | |
1335 int current_fragment; | |
1336 int coding_mode; | |
1337 | |
1338 debug_vp3(" vp3: unpacking encoding modes\n"); | |
1339 | |
1340 if (s->keyframe) { | |
1341 debug_vp3(" keyframe-- all blocks are coded as INTRA\n"); | |
1342 | |
1343 for (i = 0; i < s->fragment_count; i++) | |
1344 s->all_fragments[i].coding_method = MODE_INTRA; | |
1345 | |
1346 } else { | |
1347 | |
1348 /* fetch the mode coding scheme for this frame */ | |
1349 scheme = get_bits(gb, 3); | |
1350 debug_modes(" using mode alphabet %d\n", scheme); | |
1351 | |
1352 /* is it a custom coding scheme? */ | |
1353 if (scheme == 0) { | |
1354 debug_modes(" custom mode alphabet ahead:\n"); | |
1355 for (i = 0; i < 8; i++) | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1356 ModeAlphabet[scheme][get_bits(gb, 3)] = i; |
1224 | 1357 } |
1358 | |
1359 for (i = 0; i < 8; i++) | |
1360 debug_modes(" mode[%d][%d] = %d\n", scheme, i, | |
1361 ModeAlphabet[scheme][i]); | |
1362 | |
1363 /* iterate through all of the macroblocks that contain 1 or more | |
1364 * coded fragments */ | |
1365 for (i = 0; i < s->u_superblock_start; i++) { | |
1366 | |
1367 for (j = 0; j < 4; j++) { | |
1368 current_macroblock = s->superblock_macroblocks[i * 4 + j]; | |
1369 if ((current_macroblock == -1) || | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1370 (s->macroblock_coding[current_macroblock] == MODE_COPY)) |
1224 | 1371 continue; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1372 if (current_macroblock >= s->macroblock_count) { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1373 printf (" vp3:unpack_modes(): bad macroblock number (%d >= %d)\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1374 current_macroblock, s->macroblock_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1375 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1376 } |
1224 | 1377 |
1378 /* mode 7 means get 3 bits for each coding mode */ | |
1379 if (scheme == 7) | |
1380 coding_mode = get_bits(gb, 3); | |
1381 else | |
1382 coding_mode = ModeAlphabet[scheme][get_mode_code(gb)]; | |
1383 | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1384 s->macroblock_coding[current_macroblock] = coding_mode; |
1224 | 1385 for (k = 0; k < 6; k++) { |
1386 current_fragment = | |
1387 s->macroblock_fragments[current_macroblock * 6 + k]; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1388 if (current_fragment == -1) |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1389 continue; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1390 if (current_fragment >= s->fragment_count) { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1391 printf (" vp3:unpack_modes(): bad fragment number (%d >= %d)\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1392 current_fragment, s->fragment_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1393 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1394 } |
1224 | 1395 if (s->all_fragments[current_fragment].coding_method != |
1396 MODE_COPY) | |
1397 s->all_fragments[current_fragment].coding_method = | |
1398 coding_mode; | |
1399 } | |
1400 | |
1401 debug_modes(" coding method for macroblock starting @ fragment %d = %d\n", | |
1402 s->macroblock_fragments[current_macroblock * 6], coding_mode); | |
1403 } | |
1404 } | |
1405 } | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1406 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1407 return 0; |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1408 } |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1409 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1410 /* |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1411 * This function adjusts the components of a motion vector for the halfpel |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1412 * motion grid. c_plane indicates whether the vector applies to the U or V |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1413 * plane. The function returns the halfpel function index to be used in |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1414 * ffmpeg's put_pixels[]() array of functions. |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1415 */ |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1416 static inline int adjust_vector(int *x, int *y, int c_plane) |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1417 { |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1418 int motion_halfpel_index = 0; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1419 int x_halfpel; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1420 int y_halfpel; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1421 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1422 if (!c_plane) { |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1423 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1424 x_halfpel = *x & 1; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1425 motion_halfpel_index |= x_halfpel; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1426 if (*x >= 0) |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1427 *x >>= 1; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1428 else |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1429 *x = -( (-(*x) >> 1) + x_halfpel); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1430 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1431 y_halfpel = *y & 1; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1432 motion_halfpel_index |= (y_halfpel << 1); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1433 if (*y >= 0) |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1434 *y >>= 1; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1435 else |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1436 *y = -( (-(*y) >> 1) + y_halfpel); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1437 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1438 } else { |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1439 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1440 x_halfpel = ((*x & 0x03) != 0); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1441 motion_halfpel_index |= x_halfpel; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1442 if (*x >= 0) |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1443 *x >>= 2; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1444 else |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1445 *x = -( (-(*x) >> 2) + x_halfpel); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1446 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1447 y_halfpel = ((*y & 0x03) != 0); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1448 motion_halfpel_index |= (y_halfpel << 1); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1449 if (*y >= 0) |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1450 *y >>= 2; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1451 else |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1452 *y = -( (-(*y) >> 2) + y_halfpel); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1453 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1454 } |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1455 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1456 return motion_halfpel_index; |
1224 | 1457 } |
1458 | |
1459 /* | |
1460 * This function unpacks all the motion vectors for the individual | |
1461 * macroblocks from the bitstream. | |
1462 */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1463 static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb) |
1224 | 1464 { |
1465 int i, j, k; | |
1466 int coding_mode; | |
1467 int motion_x[6]; | |
1468 int motion_y[6]; | |
1469 int last_motion_x = 0; | |
1470 int last_motion_y = 0; | |
1471 int prior_last_motion_x = 0; | |
1472 int prior_last_motion_y = 0; | |
1473 int current_macroblock; | |
1474 int current_fragment; | |
1475 | |
1476 debug_vp3(" vp3: unpacking motion vectors\n"); | |
1477 | |
1478 if (s->keyframe) { | |
1479 | |
1480 debug_vp3(" keyframe-- there are no motion vectors\n"); | |
1481 | |
1482 } else { | |
1483 | |
1484 memset(motion_x, 0, 6 * sizeof(int)); | |
1485 memset(motion_y, 0, 6 * sizeof(int)); | |
1486 | |
1487 /* coding mode 0 is the VLC scheme; 1 is the fixed code scheme */ | |
1488 coding_mode = get_bits(gb, 1); | |
1489 debug_vectors(" using %s scheme for unpacking motion vectors\n", | |
1490 (coding_mode == 0) ? "VLC" : "fixed-length"); | |
1491 | |
1492 /* iterate through all of the macroblocks that contain 1 or more | |
1493 * coded fragments */ | |
1494 for (i = 0; i < s->u_superblock_start; i++) { | |
1495 | |
1496 for (j = 0; j < 4; j++) { | |
1497 current_macroblock = s->superblock_macroblocks[i * 4 + j]; | |
1498 if ((current_macroblock == -1) || | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1499 (s->macroblock_coding[current_macroblock] == MODE_COPY)) |
1224 | 1500 continue; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1501 if (current_macroblock >= s->macroblock_count) { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1502 printf (" vp3:unpack_vectors(): bad macroblock number (%d >= %d)\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1503 current_macroblock, s->macroblock_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1504 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1505 } |
1224 | 1506 |
1507 current_fragment = s->macroblock_fragments[current_macroblock * 6]; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1508 if (current_fragment >= s->fragment_count) { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1509 printf (" vp3:unpack_vectors(): bad fragment number (%d >= %d\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1510 current_fragment, s->fragment_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1511 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1512 } |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1513 switch (s->macroblock_coding[current_macroblock]) { |
1224 | 1514 |
1515 case MODE_INTER_PLUS_MV: | |
1516 case MODE_GOLDEN_MV: | |
1517 /* all 6 fragments use the same motion vector */ | |
1518 if (coding_mode == 0) { | |
1519 motion_x[0] = get_motion_vector_vlc(gb); | |
1520 motion_y[0] = get_motion_vector_vlc(gb); | |
1521 } else { | |
1522 motion_x[0] = get_motion_vector_fixed(gb); | |
1523 motion_y[0] = get_motion_vector_fixed(gb); | |
1524 } | |
1525 for (k = 1; k < 6; k++) { | |
1526 motion_x[k] = motion_x[0]; | |
1527 motion_y[k] = motion_y[0]; | |
1528 } | |
1529 | |
1530 /* vector maintenance, only on MODE_INTER_PLUS_MV */ | |
1531 if (s->all_fragments[current_fragment].coding_method == | |
1532 MODE_INTER_PLUS_MV) { | |
1533 prior_last_motion_x = last_motion_x; | |
1534 prior_last_motion_y = last_motion_y; | |
1535 last_motion_x = motion_x[0]; | |
1536 last_motion_y = motion_y[0]; | |
1537 } | |
1538 break; | |
1539 | |
1540 case MODE_INTER_FOURMV: | |
1541 /* fetch 4 vectors from the bitstream, one for each | |
1542 * Y fragment, then average for the C fragment vectors */ | |
1543 motion_x[4] = motion_y[4] = 0; | |
1544 for (k = 0; k < 4; k++) { | |
1545 if (coding_mode == 0) { | |
1546 motion_x[k] = get_motion_vector_vlc(gb); | |
1547 motion_y[k] = get_motion_vector_vlc(gb); | |
1548 } else { | |
1549 motion_x[k] = get_motion_vector_fixed(gb); | |
1550 motion_y[k] = get_motion_vector_fixed(gb); | |
1551 } | |
1552 motion_x[4] += motion_x[k]; | |
1553 motion_y[4] += motion_y[k]; | |
1554 } | |
1555 | |
1556 if (motion_x[4] >= 0) | |
1557 motion_x[4] = (motion_x[4] + 2) / 4; | |
1558 else | |
1559 motion_x[4] = (motion_x[4] - 2) / 4; | |
1560 motion_x[5] = motion_x[4]; | |
1561 | |
1562 if (motion_y[4] >= 0) | |
1563 motion_y[4] = (motion_y[4] + 2) / 4; | |
1564 else | |
1565 motion_y[4] = (motion_y[4] - 2) / 4; | |
1566 motion_y[5] = motion_y[4]; | |
1567 | |
1568 /* vector maintenance; vector[3] is treated as the | |
1569 * last vector in this case */ | |
1570 prior_last_motion_x = last_motion_x; | |
1571 prior_last_motion_y = last_motion_y; | |
1572 last_motion_x = motion_x[3]; | |
1573 last_motion_y = motion_y[3]; | |
1574 break; | |
1575 | |
1576 case MODE_INTER_LAST_MV: | |
1577 /* all 6 fragments use the last motion vector */ | |
1578 motion_x[0] = last_motion_x; | |
1579 motion_y[0] = last_motion_y; | |
1580 for (k = 1; k < 6; k++) { | |
1581 motion_x[k] = motion_x[0]; | |
1582 motion_y[k] = motion_y[0]; | |
1583 } | |
1584 | |
1585 /* no vector maintenance (last vector remains the | |
1586 * last vector) */ | |
1587 break; | |
1588 | |
1589 case MODE_INTER_PRIOR_LAST: | |
1590 /* all 6 fragments use the motion vector prior to the | |
1591 * last motion vector */ | |
1592 motion_x[0] = prior_last_motion_x; | |
1593 motion_y[0] = prior_last_motion_y; | |
1594 for (k = 1; k < 6; k++) { | |
1595 motion_x[k] = motion_x[0]; | |
1596 motion_y[k] = motion_y[0]; | |
1597 } | |
1598 | |
1599 /* vector maintenance */ | |
1600 prior_last_motion_x = last_motion_x; | |
1601 prior_last_motion_y = last_motion_y; | |
1602 last_motion_x = motion_x[0]; | |
1603 last_motion_y = motion_y[0]; | |
1604 break; | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1605 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1606 default: |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1607 /* covers intra, inter without MV, golden without MV */ |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1608 memset(motion_x, 0, 6 * sizeof(int)); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1609 memset(motion_y, 0, 6 * sizeof(int)); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1610 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1611 /* no vector maintenance */ |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1612 break; |
1224 | 1613 } |
1614 | |
1615 /* assign the motion vectors to the correct fragments */ | |
1616 debug_vectors(" vectors for macroblock starting @ fragment %d (coding method %d):\n", | |
1617 current_fragment, | |
1618 s->all_fragments[current_fragment].coding_method); | |
1619 for (k = 0; k < 6; k++) { | |
1620 current_fragment = | |
1621 s->macroblock_fragments[current_macroblock * 6 + k]; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1622 if (current_fragment == -1) |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1623 continue; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1624 if (current_fragment >= s->fragment_count) { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1625 printf (" vp3:unpack_vectors(): bad fragment number (%d >= %d)\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1626 current_fragment, s->fragment_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1627 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1628 } |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1629 s->all_fragments[current_fragment].motion_halfpel_index = |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1630 adjust_vector(&motion_x[k], &motion_y[k], |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1631 ((k == 4) || (k == 5))); |
1224 | 1632 s->all_fragments[current_fragment].motion_x = motion_x[k]; |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1633 s->all_fragments[current_fragment].motion_y = motion_y[k]; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1634 debug_vectors(" vector %d: fragment %d = (%d, %d), index %d\n", |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1635 k, current_fragment, motion_x[k], motion_y[k], |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1636 s->all_fragments[current_fragment].motion_halfpel_index); |
1224 | 1637 } |
1638 } | |
1639 } | |
1640 } | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1641 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1642 return 0; |
1224 | 1643 } |
1644 | |
1645 /* | |
1646 * This function is called by unpack_dct_coeffs() to extract the VLCs from | |
1647 * the bitstream. The VLCs encode tokens which are used to unpack DCT | |
1648 * data. This function unpacks all the VLCs for either the Y plane or both | |
1649 * C planes, and is called for DC coefficients or different AC coefficient | |
1650 * levels (since different coefficient types require different VLC tables. | |
1651 * | |
1652 * This function returns a residual eob run. E.g, if a particular token gave | |
1653 * instructions to EOB the next 5 fragments and there were only 2 fragments | |
1654 * left in the current fragment range, 3 would be returned so that it could | |
1655 * be passed into the next call to this same function. | |
1656 */ | |
1657 static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, | |
1658 VLC *table, int coeff_index, | |
1659 int first_fragment, int last_fragment, | |
1660 int eob_run) | |
1661 { | |
1662 int i; | |
1663 int token; | |
1664 int zero_run; | |
1665 DCTELEM coeff; | |
1666 Vp3Fragment *fragment; | |
1667 | |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1668 if ((first_fragment >= s->fragment_count) || |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1669 (last_fragment >= s->fragment_count)) { |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1670 |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1671 printf (" vp3:unpack_vlcs(): bad fragment number (%d -> %d ?)\n", |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1672 first_fragment, last_fragment); |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1673 return 0; |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1674 } |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1675 |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1676 for (i = first_fragment; i <= last_fragment; i++) { |
1224 | 1677 |
1678 fragment = &s->all_fragments[s->coded_fragment_list[i]]; | |
1679 if (fragment->coeff_count > coeff_index) | |
1680 continue; | |
1681 | |
1682 if (!eob_run) { | |
1683 /* decode a VLC into a token */ | |
1684 token = get_vlc2(gb, table->table, 5, 3); | |
1685 debug_vlc(" token = %2d, ", token); | |
1686 /* use the token to get a zero run, a coefficient, and an eob run */ | |
1687 unpack_token(gb, token, &zero_run, &coeff, &eob_run); | |
1688 } | |
1689 | |
1690 if (!eob_run) { | |
1691 fragment->coeff_count += zero_run; | |
1692 if (fragment->coeff_count < 64) | |
1693 fragment->coeffs[fragment->coeff_count++] = coeff; | |
1694 debug_vlc(" fragment %d coeff = %d\n", | |
1695 s->coded_fragment_list[i], fragment->coeffs[coeff_index]); | |
1696 } else { | |
1697 fragment->last_coeff = fragment->coeff_count; | |
1698 fragment->coeff_count = 64; | |
1699 debug_vlc(" fragment %d eob with %d coefficients\n", | |
1700 s->coded_fragment_list[i], fragment->last_coeff); | |
1701 eob_run--; | |
1702 } | |
1703 } | |
1704 | |
1705 return eob_run; | |
1706 } | |
1707 | |
1708 /* | |
1709 * This function unpacks all of the DCT coefficient data from the | |
1710 * bitstream. | |
1711 */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1712 static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) |
1224 | 1713 { |
1714 int i; | |
1715 int dc_y_table; | |
1716 int dc_c_table; | |
1717 int ac_y_table; | |
1718 int ac_c_table; | |
1719 int residual_eob_run = 0; | |
1720 | |
1721 /* fetch the DC table indices */ | |
1722 dc_y_table = get_bits(gb, 4); | |
1723 dc_c_table = get_bits(gb, 4); | |
1724 | |
1725 /* unpack the Y plane DC coefficients */ | |
1726 debug_vp3(" vp3: unpacking Y plane DC coefficients using table %d\n", | |
1727 dc_y_table); | |
1728 residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_y_table], 0, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1729 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1730 |
1731 /* unpack the C plane DC coefficients */ | |
1732 debug_vp3(" vp3: unpacking C plane DC coefficients using table %d\n", | |
1733 dc_c_table); | |
1734 residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1735 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1736 |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1737 /* fetch the AC table indices */ |
1224 | 1738 ac_y_table = get_bits(gb, 4); |
1739 ac_c_table = get_bits(gb, 4); | |
1740 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1741 /* unpack the group 1 AC coefficients (coeffs 1-5) */ |
1224 | 1742 for (i = 1; i <= 5; i++) { |
1743 | |
1744 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n", | |
1745 i, ac_y_table); | |
1746 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_y_table], i, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1747 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1748 |
1749 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n", | |
1750 i, ac_c_table); | |
1751 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_1[ac_c_table], i, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1752 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1753 } |
1754 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1755 /* unpack the group 2 AC coefficients (coeffs 6-14) */ |
1224 | 1756 for (i = 6; i <= 14; i++) { |
1757 | |
1758 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n", | |
1759 i, ac_y_table); | |
1760 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_y_table], i, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1761 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1762 |
1763 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n", | |
1764 i, ac_c_table); | |
1765 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_2[ac_c_table], i, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1766 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1767 } |
1768 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1769 /* unpack the group 3 AC coefficients (coeffs 15-27) */ |
1224 | 1770 for (i = 15; i <= 27; i++) { |
1771 | |
1772 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n", | |
1773 i, ac_y_table); | |
1774 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_y_table], i, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1775 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1776 |
1777 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n", | |
1778 i, ac_c_table); | |
1779 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_3[ac_c_table], i, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1780 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1781 } |
1782 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1783 /* unpack the group 4 AC coefficients (coeffs 28-63) */ |
1224 | 1784 for (i = 28; i <= 63; i++) { |
1785 | |
1786 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n", | |
1787 i, ac_y_table); | |
1788 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_y_table], i, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1789 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1790 |
1791 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n", | |
1792 i, ac_c_table); | |
1793 residual_eob_run = unpack_vlcs(s, gb, &s->ac_vlc_4[ac_c_table], i, | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1794 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1795 } |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1796 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1797 return 0; |
1224 | 1798 } |
1799 | |
1800 /* | |
1801 * This function reverses the DC prediction for each coded fragment in | |
1802 * the frame. Much of this function is adapted directly from the original | |
1803 * VP3 source code. | |
1804 */ | |
1805 #define COMPATIBLE_FRAME(x) \ | |
1806 (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type) | |
1807 #define FRAME_CODED(x) (s->all_fragments[x].coding_method != MODE_COPY) | |
1808 static inline int iabs (int x) { return ((x < 0) ? -x : x); } | |
1809 | |
1810 static void reverse_dc_prediction(Vp3DecodeContext *s, | |
1811 int first_fragment, | |
1812 int fragment_width, | |
1813 int fragment_height) | |
1814 { | |
1815 | |
1816 #define PUL 8 | |
1817 #define PU 4 | |
1818 #define PUR 2 | |
1819 #define PL 1 | |
1820 | |
1821 int x, y; | |
1822 int i = first_fragment; | |
1823 | |
1824 /* | |
1825 * Fragment prediction groups: | |
1826 * | |
1827 * 32222222226 | |
1828 * 10000000004 | |
1829 * 10000000004 | |
1830 * 10000000004 | |
1831 * 10000000004 | |
1832 * | |
1833 * Note: Groups 5 and 7 do not exist as it would mean that the | |
1834 * fragment's x coordinate is both 0 and (width - 1) at the same time. | |
1835 */ | |
1836 int predictor_group; | |
1837 short predicted_dc; | |
1838 | |
1839 /* validity flags for the left, up-left, up, and up-right fragments */ | |
1840 int fl, ful, fu, fur; | |
1841 | |
1842 /* DC values for the left, up-left, up, and up-right fragments */ | |
1843 int vl, vul, vu, vur; | |
1844 | |
1845 /* indices for the left, up-left, up, and up-right fragments */ | |
1846 int l, ul, u, ur; | |
1847 | |
1848 /* | |
1849 * The 6 fields mean: | |
1850 * 0: up-left multiplier | |
1851 * 1: up multiplier | |
1852 * 2: up-right multiplier | |
1853 * 3: left multiplier | |
1854 * 4: mask | |
1855 * 5: right bit shift divisor (e.g., 7 means >>=7, a.k.a. div by 128) | |
1856 */ | |
1857 int predictor_transform[16][6] = { | |
1858 { 0, 0, 0, 0, 0, 0 }, | |
1859 { 0, 0, 0, 1, 0, 0 }, // PL | |
1860 { 0, 0, 1, 0, 0, 0 }, // PUR | |
1861 { 0, 0, 53, 75, 127, 7 }, // PUR|PL | |
1862 { 0, 1, 0, 0, 0, 0 }, // PU | |
1863 { 0, 1, 0, 1, 1, 1 }, // PU|PL | |
1864 { 0, 1, 0, 0, 0, 0 }, // PU|PUR | |
1865 { 0, 0, 53, 75, 127, 7 }, // PU|PUR|PL | |
1866 { 1, 0, 0, 0, 0, 0 }, // PUL | |
1867 { 0, 0, 0, 1, 0, 0 }, // PUL|PL | |
1868 { 1, 0, 1, 0, 1, 1 }, // PUL|PUR | |
1869 { 0, 0, 53, 75, 127, 7 }, // PUL|PUR|PL | |
1870 { 0, 1, 0, 0, 0, 0 }, // PUL|PU | |
1871 {-26, 29, 0, 29, 31, 5 }, // PUL|PU|PL | |
1872 { 3, 10, 3, 0, 15, 4 }, // PUL|PU|PUR | |
1873 {-26, 29, 0, 29, 31, 5 } // PUL|PU|PUR|PL | |
1874 }; | |
1875 | |
1876 /* This table shows which types of blocks can use other blocks for | |
1877 * prediction. For example, INTRA is the only mode in this table to | |
1878 * have a frame number of 0. That means INTRA blocks can only predict | |
1879 * from other INTRA blocks. There are 2 golden frame coding types; | |
1880 * blocks encoding in these modes can only predict from other blocks | |
1881 * that were encoded with these 1 of these 2 modes. */ | |
1882 unsigned char compatible_frame[8] = { | |
1883 1, /* MODE_INTER_NO_MV */ | |
1884 0, /* MODE_INTRA */ | |
1885 1, /* MODE_INTER_PLUS_MV */ | |
1886 1, /* MODE_INTER_LAST_MV */ | |
1887 1, /* MODE_INTER_PRIOR_MV */ | |
1888 2, /* MODE_USING_GOLDEN */ | |
1889 2, /* MODE_GOLDEN_MV */ | |
1890 1 /* MODE_INTER_FOUR_MV */ | |
1891 }; | |
1892 int current_frame_type; | |
1893 | |
1894 /* there is a last DC predictor for each of the 3 frame types */ | |
1895 short last_dc[3]; | |
1896 | |
1897 int transform = 0; | |
1898 | |
1899 debug_vp3(" vp3: reversing DC prediction\n"); | |
1900 | |
1901 vul = vu = vur = vl = 0; | |
1902 last_dc[0] = last_dc[1] = last_dc[2] = 0; | |
1903 | |
1904 /* for each fragment row... */ | |
1905 for (y = 0; y < fragment_height; y++) { | |
1906 | |
1907 /* for each fragment in a row... */ | |
1908 for (x = 0; x < fragment_width; x++, i++) { | |
1909 | |
1910 /* reverse prediction if this block was coded */ | |
1911 if (s->all_fragments[i].coding_method != MODE_COPY) { | |
1912 | |
1913 current_frame_type = | |
1914 compatible_frame[s->all_fragments[i].coding_method]; | |
1915 predictor_group = (x == 0) + ((y == 0) << 1) + | |
1916 ((x + 1 == fragment_width) << 2); | |
1917 debug_dc_pred(" frag %d: group %d, orig DC = %d, ", | |
1918 i, predictor_group, s->all_fragments[i].coeffs[0]); | |
1919 | |
1920 switch (predictor_group) { | |
1921 | |
1922 case 0: | |
1923 /* main body of fragments; consider all 4 possible | |
1924 * fragments for prediction */ | |
1925 | |
1926 /* calculate the indices of the predicting fragments */ | |
1927 ul = i - fragment_width - 1; | |
1928 u = i - fragment_width; | |
1929 ur = i - fragment_width + 1; | |
1930 l = i - 1; | |
1931 | |
1932 /* fetch the DC values for the predicting fragments */ | |
1933 vul = s->all_fragments[ul].coeffs[0]; | |
1934 vu = s->all_fragments[u].coeffs[0]; | |
1935 vur = s->all_fragments[ur].coeffs[0]; | |
1936 vl = s->all_fragments[l].coeffs[0]; | |
1937 | |
1938 /* figure out which fragments are valid */ | |
1939 ful = FRAME_CODED(ul) && COMPATIBLE_FRAME(ul); | |
1940 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u); | |
1941 fur = FRAME_CODED(ur) && COMPATIBLE_FRAME(ur); | |
1942 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l); | |
1943 | |
1944 /* decide which predictor transform to use */ | |
1945 transform = (fl*PL) | (fu*PU) | (ful*PUL) | (fur*PUR); | |
1946 | |
1947 break; | |
1948 | |
1949 case 1: | |
1950 /* left column of fragments, not including top corner; | |
1951 * only consider up and up-right fragments */ | |
1952 | |
1953 /* calculate the indices of the predicting fragments */ | |
1954 u = i - fragment_width; | |
1955 ur = i - fragment_width + 1; | |
1956 | |
1957 /* fetch the DC values for the predicting fragments */ | |
1958 vu = s->all_fragments[u].coeffs[0]; | |
1959 vur = s->all_fragments[ur].coeffs[0]; | |
1960 | |
1961 /* figure out which fragments are valid */ | |
1962 fur = FRAME_CODED(ur) && COMPATIBLE_FRAME(ur); | |
1963 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u); | |
1964 | |
1965 /* decide which predictor transform to use */ | |
1966 transform = (fu*PU) | (fur*PUR); | |
1967 | |
1968 break; | |
1969 | |
1970 case 2: | |
1971 case 6: | |
1972 /* top row of fragments, not including top-left frag; | |
1973 * only consider the left fragment for prediction */ | |
1974 | |
1975 /* calculate the indices of the predicting fragments */ | |
1976 l = i - 1; | |
1977 | |
1978 /* fetch the DC values for the predicting fragments */ | |
1979 vl = s->all_fragments[l].coeffs[0]; | |
1980 | |
1981 /* figure out which fragments are valid */ | |
1982 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l); | |
1983 | |
1984 /* decide which predictor transform to use */ | |
1985 transform = (fl*PL); | |
1986 | |
1987 break; | |
1988 | |
1989 case 3: | |
1990 /* top-left fragment */ | |
1991 | |
1992 /* nothing to predict from in this case */ | |
1993 transform = 0; | |
1994 | |
1995 break; | |
1996 | |
1997 case 4: | |
1998 /* right column of fragments, not including top corner; | |
1999 * consider up-left, up, and left fragments for | |
2000 * prediction */ | |
2001 | |
2002 /* calculate the indices of the predicting fragments */ | |
2003 ul = i - fragment_width - 1; | |
2004 u = i - fragment_width; | |
2005 l = i - 1; | |
2006 | |
2007 /* fetch the DC values for the predicting fragments */ | |
2008 vul = s->all_fragments[ul].coeffs[0]; | |
2009 vu = s->all_fragments[u].coeffs[0]; | |
2010 vl = s->all_fragments[l].coeffs[0]; | |
2011 | |
2012 /* figure out which fragments are valid */ | |
2013 ful = FRAME_CODED(ul) && COMPATIBLE_FRAME(ul); | |
2014 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u); | |
2015 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l); | |
2016 | |
2017 /* decide which predictor transform to use */ | |
2018 transform = (fl*PL) | (fu*PU) | (ful*PUL); | |
2019 | |
2020 break; | |
2021 | |
2022 } | |
2023 | |
2024 debug_dc_pred("transform = %d, ", transform); | |
2025 | |
2026 if (transform == 0) { | |
2027 | |
2028 /* if there were no fragments to predict from, use last | |
2029 * DC saved */ | |
2030 s->all_fragments[i].coeffs[0] += last_dc[current_frame_type]; | |
2031 debug_dc_pred("from last DC (%d) = %d\n", | |
2032 current_frame_type, s->all_fragments[i].coeffs[0]); | |
2033 | |
2034 } else { | |
2035 | |
2036 /* apply the appropriate predictor transform */ | |
2037 predicted_dc = | |
2038 (predictor_transform[transform][0] * vul) + | |
2039 (predictor_transform[transform][1] * vu) + | |
2040 (predictor_transform[transform][2] * vur) + | |
2041 (predictor_transform[transform][3] * vl); | |
2042 | |
2043 /* if there is a shift value in the transform, add | |
2044 * the sign bit before the shift */ | |
2045 if (predictor_transform[transform][5] != 0) { | |
2046 predicted_dc += ((predicted_dc >> 15) & | |
2047 predictor_transform[transform][4]); | |
2048 predicted_dc >>= predictor_transform[transform][5]; | |
2049 } | |
2050 | |
2051 /* check for outranging on the [ul u l] and | |
2052 * [ul u ur l] predictors */ | |
2053 if ((transform == 13) || (transform == 15)) { | |
2054 if (iabs(predicted_dc - vu) > 128) | |
2055 predicted_dc = vu; | |
2056 else if (iabs(predicted_dc - vl) > 128) | |
2057 predicted_dc = vl; | |
2058 else if (iabs(predicted_dc - vul) > 128) | |
2059 predicted_dc = vul; | |
2060 } | |
2061 | |
2062 /* at long last, apply the predictor */ | |
2063 s->all_fragments[i].coeffs[0] += predicted_dc; | |
2064 debug_dc_pred("from pred DC = %d\n", | |
2065 s->all_fragments[i].coeffs[0]); | |
2066 } | |
2067 | |
2068 /* save the DC */ | |
2069 last_dc[current_frame_type] = s->all_fragments[i].coeffs[0]; | |
2070 } | |
2071 } | |
2072 } | |
2073 } | |
2074 | |
2075 /* | |
2076 * This function performs the final rendering of each fragment's data | |
2077 * onto the output frame. | |
2078 */ | |
2079 static void render_fragments(Vp3DecodeContext *s, | |
2080 int first_fragment, | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2081 int width, |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2082 int height, |
1224 | 2083 int plane /* 0 = Y, 1 = U, 2 = V */) |
2084 { | |
2085 int x, y; | |
2086 int m, n; | |
2087 int i = first_fragment; | |
2088 int j; | |
2089 int16_t *dequantizer; | |
2090 DCTELEM dequant_block[64]; | |
1239 | 2091 DCTELEM dequant_block_permuted[64]; |
1224 | 2092 unsigned char *output_plane; |
2093 unsigned char *last_plane; | |
2094 unsigned char *golden_plane; | |
2095 int stride; | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2096 int motion_x, motion_y; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2097 int upper_motion_limit, lower_motion_limit; |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2098 int motion_halfpel_index; |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2099 unsigned int motion_source; |
1224 | 2100 |
2101 debug_vp3(" vp3: rendering final fragments for %s\n", | |
2102 (plane == 0) ? "Y plane" : (plane == 1) ? "U plane" : "V plane"); | |
2103 | |
2104 /* set up plane-specific parameters */ | |
2105 if (plane == 0) { | |
2106 dequantizer = s->intra_y_dequant; | |
2107 output_plane = s->current_frame.data[0]; | |
1227
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2108 last_plane = s->last_frame.data[0]; |
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2109 golden_plane = s->golden_frame.data[0]; |
1224 | 2110 stride = -s->current_frame.linesize[0]; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2111 upper_motion_limit = 7 * s->current_frame.linesize[0]; |
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2112 lower_motion_limit = height * s->current_frame.linesize[0] + width - 8; |
1224 | 2113 } else if (plane == 1) { |
2114 dequantizer = s->intra_c_dequant; | |
2115 output_plane = s->current_frame.data[1]; | |
1227
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2116 last_plane = s->last_frame.data[1]; |
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2117 golden_plane = s->golden_frame.data[1]; |
1224 | 2118 stride = -s->current_frame.linesize[1]; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2119 upper_motion_limit = 7 * s->current_frame.linesize[1]; |
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2120 lower_motion_limit = height * s->current_frame.linesize[1] + width - 8; |
1224 | 2121 } else { |
2122 dequantizer = s->intra_c_dequant; | |
2123 output_plane = s->current_frame.data[2]; | |
1227
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2124 last_plane = s->last_frame.data[2]; |
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2125 golden_plane = s->golden_frame.data[2]; |
1224 | 2126 stride = -s->current_frame.linesize[2]; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2127 upper_motion_limit = 7 * s->current_frame.linesize[2]; |
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2128 lower_motion_limit = height * s->current_frame.linesize[2] + width - 8; |
1224 | 2129 } |
2130 | |
2131 /* for each fragment row... */ | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2132 for (y = 0; y < height; y += 8) { |
1224 | 2133 |
2134 /* for each fragment in a row... */ | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2135 for (x = 0; x < width; x += 8, i++) { |
1224 | 2136 |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2137 if ((i < 0) || (i >= s->fragment_count)) { |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2138 printf (" vp3:render_fragments(): bad fragment number (%d)\n", i); |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2139 return; |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2140 } |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2141 |
1224 | 2142 /* transform if this block was coded */ |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2143 if (s->all_fragments[i].coding_method != MODE_COPY) { |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2144 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2145 /* sort out the motion vector */ |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2146 motion_x = s->all_fragments[i].motion_x; |
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2147 motion_y = s->all_fragments[i].motion_y; |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2148 motion_halfpel_index = s->all_fragments[i].motion_halfpel_index; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2149 |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2150 motion_source = s->all_fragments[i].first_pixel; |
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2151 motion_source += motion_x; |
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2152 motion_source += (motion_y * stride); |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2153 |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2154 /* if the are any problems with a motion vector, refuse |
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2155 * to render the block */ |
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2156 if ((motion_source < upper_motion_limit) || |
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2157 (motion_source > lower_motion_limit)) { |
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2158 // printf (" vp3: help! motion source (%d) out of range (%d..%d)\n", |
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2159 // motion_source, upper_motion_limit, lower_motion_limit); |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2160 continue; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2161 } |
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2162 |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2163 /* first, take care of copying a block from either the |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2164 * previous or the golden frame */ |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2165 if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) || |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2166 (s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) { |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2167 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2168 s->dsp.put_pixels_tab[1][motion_halfpel_index]( |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2169 output_plane + s->all_fragments[i].first_pixel, |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2170 golden_plane + motion_source, |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2171 stride, 8); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2172 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2173 } else |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2174 if (s->all_fragments[i].coding_method != MODE_INTRA) { |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2175 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2176 s->dsp.put_pixels_tab[1][motion_halfpel_index]( |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2177 output_plane + s->all_fragments[i].first_pixel, |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2178 last_plane + motion_source, |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2179 stride, 8); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2180 } |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2181 |
1224 | 2182 /* dequantize the DCT coefficients */ |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2183 debug_idct("fragment %d, coding mode %d, DC = %d, dequant = %d:\n", |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2184 i, s->all_fragments[i].coding_method, |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2185 s->all_fragments[i].coeffs[0], dequantizer[0]); |
1224 | 2186 for (j = 0; j < 64; j++) |
1239 | 2187 dequant_block[dezigzag_index[j]] = |
1224 | 2188 s->all_fragments[i].coeffs[j] * |
2189 dequantizer[j]; | |
1239 | 2190 for (j = 0; j < 64; j++) |
2191 dequant_block_permuted[s->dsp.idct_permutation[j]] = | |
2192 dequant_block[j]; | |
1224 | 2193 |
2194 debug_idct("dequantized block:\n"); | |
2195 for (m = 0; m < 8; m++) { | |
2196 for (n = 0; n < 8; n++) { | |
2197 debug_idct(" %5d", dequant_block[m * 8 + n]); | |
2198 } | |
2199 debug_idct("\n"); | |
2200 } | |
2201 debug_idct("\n"); | |
2202 | |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2203 /* invert DCT and place (or add) in final output */ |
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2204 |
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2205 if (s->all_fragments[i].coding_method == MODE_INTRA) { |
1239 | 2206 dequant_block_permuted[0] += 1024; |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2207 s->dsp.idct_put( |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2208 output_plane + s->all_fragments[i].first_pixel, |
1239 | 2209 stride, dequant_block_permuted); |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2210 } else { |
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2211 s->dsp.idct_add( |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2212 output_plane + s->all_fragments[i].first_pixel, |
1239 | 2213 stride, dequant_block_permuted); |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2214 } |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2215 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2216 debug_idct("block after idct_%s():\n", |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2217 (s->all_fragments[i].coding_method == MODE_INTRA)? |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2218 "put" : "add"); |
1224 | 2219 for (m = 0; m < 8; m++) { |
2220 for (n = 0; n < 8; n++) { | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2221 debug_idct(" %3d", *(output_plane + |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2222 s->all_fragments[i].first_pixel + (m * stride + n))); |
1224 | 2223 } |
2224 debug_idct("\n"); | |
2225 } | |
2226 debug_idct("\n"); | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2227 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2228 } else { |
1224 | 2229 |
2230 /* copy directly from the previous frame */ | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2231 s->dsp.put_pixels_tab[1][0]( |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2232 output_plane + s->all_fragments[i].first_pixel, |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2233 last_plane + s->all_fragments[i].first_pixel, |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2234 stride, 8); |
1224 | 2235 |
2236 } | |
2237 } | |
2238 } | |
2239 | |
2240 emms_c(); | |
2241 | |
2242 } | |
2243 | |
2244 /* | |
2245 * This function computes the first pixel addresses for each fragment. | |
2246 * This function needs to be invoked after the first frame is allocated | |
2247 * so that it has access to the plane strides. | |
2248 */ | |
2249 static void vp3_calculate_pixel_addresses(Vp3DecodeContext *s) | |
2250 { | |
2251 | |
2252 int i, x, y; | |
2253 | |
2254 /* figure out the first pixel addresses for each of the fragments */ | |
2255 /* Y plane */ | |
2256 i = 0; | |
2257 for (y = s->fragment_height; y > 0; y--) { | |
2258 for (x = 0; x < s->fragment_width; x++) { | |
2259 s->all_fragments[i++].first_pixel = | |
2260 s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS - | |
2261 s->golden_frame.linesize[0] + | |
2262 x * FRAGMENT_PIXELS; | |
2263 debug_init(" fragment %d, first pixel @ %d\n", | |
2264 i-1, s->all_fragments[i-1].first_pixel); | |
2265 } | |
2266 } | |
2267 | |
2268 /* U plane */ | |
2269 i = s->u_fragment_start; | |
2270 for (y = s->fragment_height / 2; y > 0; y--) { | |
2271 for (x = 0; x < s->fragment_width / 2; x++) { | |
2272 s->all_fragments[i++].first_pixel = | |
2273 s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS - | |
2274 s->golden_frame.linesize[1] + | |
2275 x * FRAGMENT_PIXELS; | |
2276 debug_init(" fragment %d, first pixel @ %d\n", | |
2277 i-1, s->all_fragments[i-1].first_pixel); | |
2278 } | |
2279 } | |
2280 | |
2281 /* V plane */ | |
2282 i = s->v_fragment_start; | |
2283 for (y = s->fragment_height / 2; y > 0; y--) { | |
2284 for (x = 0; x < s->fragment_width / 2; x++) { | |
2285 s->all_fragments[i++].first_pixel = | |
2286 s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS - | |
2287 s->golden_frame.linesize[2] + | |
2288 x * FRAGMENT_PIXELS; | |
2289 debug_init(" fragment %d, first pixel @ %d\n", | |
2290 i-1, s->all_fragments[i-1].first_pixel); | |
2291 } | |
2292 } | |
2293 } | |
2294 | |
2295 /* | |
2296 * This is the ffmpeg/libavcodec API init function. | |
2297 */ | |
2298 static int vp3_decode_init(AVCodecContext *avctx) | |
2299 { | |
2300 Vp3DecodeContext *s = avctx->priv_data; | |
2301 int i; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2302 int c_width; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2303 int c_height; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2304 int y_superblock_count; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2305 int c_superblock_count; |
1224 | 2306 |
2307 s->avctx = avctx; | |
2308 s->width = avctx->width; | |
2309 s->height = avctx->height; | |
2310 avctx->pix_fmt = PIX_FMT_YUV420P; | |
2311 avctx->has_b_frames = 0; | |
2312 dsputil_init(&s->dsp, avctx); | |
2313 | |
2314 /* initialize to an impossible value which will force a recalculation | |
2315 * in the first frame decode */ | |
2316 s->quality_index = -1; | |
2317 | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2318 s->y_superblock_width = (s->width + 31) / 32; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2319 s->y_superblock_height = (s->height + 31) / 32; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2320 y_superblock_count = s->y_superblock_width * s->y_superblock_height; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2321 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2322 /* work out the dimensions for the C planes */ |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2323 c_width = s->width / 2; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2324 c_height = s->height / 2; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2325 s->c_superblock_width = (c_width + 31) / 32; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2326 s->c_superblock_height = (c_height + 31) / 32; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2327 c_superblock_count = s->c_superblock_width * s->c_superblock_height; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2328 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2329 s->superblock_count = y_superblock_count + (c_superblock_count * 2); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2330 s->u_superblock_start = y_superblock_count; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2331 s->v_superblock_start = s->u_superblock_start + c_superblock_count; |
1224 | 2332 s->superblock_coding = av_malloc(s->superblock_count); |
2333 | |
2334 s->macroblock_width = (s->width + 15) / 16; | |
2335 s->macroblock_height = (s->height + 15) / 16; | |
2336 s->macroblock_count = s->macroblock_width * s->macroblock_height; | |
2337 | |
2338 s->fragment_width = s->width / FRAGMENT_PIXELS; | |
2339 s->fragment_height = s->height / FRAGMENT_PIXELS; | |
2340 | |
2341 /* fragment count covers all 8x8 blocks for all 3 planes */ | |
2342 s->fragment_count = s->fragment_width * s->fragment_height * 3 / 2; | |
2343 s->u_fragment_start = s->fragment_width * s->fragment_height; | |
2344 s->v_fragment_start = s->fragment_width * s->fragment_height * 5 / 4; | |
2345 | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2346 debug_init(" Y plane: %d x %d\n", s->width, s->height); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2347 debug_init(" C plane: %d x %d\n", c_width, c_height); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2348 debug_init(" Y superblocks: %d x %d, %d total\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2349 s->y_superblock_width, s->y_superblock_height, y_superblock_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2350 debug_init(" C superblocks: %d x %d, %d total\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2351 s->c_superblock_width, s->c_superblock_height, c_superblock_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2352 debug_init(" total superblocks = %d, U starts @ %d, V starts @ %d\n", |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2353 s->superblock_count, s->u_superblock_start, s->v_superblock_start); |
1224 | 2354 debug_init(" macroblocks: %d x %d, %d total\n", |
2355 s->macroblock_width, s->macroblock_height, s->macroblock_count); | |
2356 debug_init(" %d fragments, %d x %d, u starts @ %d, v starts @ %d\n", | |
2357 s->fragment_count, | |
2358 s->fragment_width, | |
2359 s->fragment_height, | |
2360 s->u_fragment_start, | |
2361 s->v_fragment_start); | |
2362 | |
2363 s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment)); | |
2364 s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int)); | |
2365 s->pixel_addresses_inited = 0; | |
2366 | |
2367 /* init VLC tables */ | |
2368 for (i = 0; i < 16; i++) { | |
2369 | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
2370 /* DC histograms */ |
1224 | 2371 init_vlc(&s->dc_vlc[i], 5, 32, |
2372 &dc_bias[i][0][1], 4, 2, | |
2373 &dc_bias[i][0][0], 4, 2); | |
2374 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2375 /* group 1 AC histograms */ |
1224 | 2376 init_vlc(&s->ac_vlc_1[i], 5, 32, |
2377 &ac_bias_0[i][0][1], 4, 2, | |
2378 &ac_bias_0[i][0][0], 4, 2); | |
2379 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2380 /* group 2 AC histograms */ |
1224 | 2381 init_vlc(&s->ac_vlc_2[i], 5, 32, |
2382 &ac_bias_1[i][0][1], 4, 2, | |
2383 &ac_bias_1[i][0][0], 4, 2); | |
2384 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2385 /* group 3 AC histograms */ |
1224 | 2386 init_vlc(&s->ac_vlc_3[i], 5, 32, |
2387 &ac_bias_2[i][0][1], 4, 2, | |
2388 &ac_bias_2[i][0][0], 4, 2); | |
2389 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2390 /* group 4 AC histograms */ |
1224 | 2391 init_vlc(&s->ac_vlc_4[i], 5, 32, |
2392 &ac_bias_3[i][0][1], 4, 2, | |
2393 &ac_bias_3[i][0][0], 4, 2); | |
2394 } | |
2395 | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
2396 /* build quantization zigzag table */ |
1224 | 2397 for (i = 0; i < 64; i++) |
1239 | 2398 zigzag_index[dezigzag_index[i]] = i; |
1224 | 2399 |
2400 /* work out the block mapping tables */ | |
2401 s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int)); | |
2402 s->superblock_macroblocks = av_malloc(s->superblock_count * 4 * sizeof(int)); | |
2403 s->macroblock_fragments = av_malloc(s->macroblock_count * 6 * sizeof(int)); | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
2404 s->macroblock_coding = av_malloc(s->macroblock_count + 1); |
1224 | 2405 init_block_mapping(s); |
2406 | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2407 for (i = 0; i < 3; i++) { |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2408 s->current_frame.data[i] = NULL; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2409 s->last_frame.data[i] = NULL; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2410 s->golden_frame.data[i] = NULL; |
1227
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2411 } |
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2412 |
1224 | 2413 return 0; |
2414 } | |
2415 | |
2416 /* | |
2417 * This is the ffmpeg/libavcodec API frame decode function. | |
2418 */ | |
2419 static int vp3_decode_frame(AVCodecContext *avctx, | |
2420 void *data, int *data_size, | |
2421 uint8_t *buf, int buf_size) | |
2422 { | |
2423 Vp3DecodeContext *s = avctx->priv_data; | |
2424 GetBitContext gb; | |
2425 static int counter = 0; | |
2426 | |
2427 *data_size = 0; | |
2428 | |
2429 init_get_bits(&gb, buf, buf_size * 8); | |
2430 | |
2431 s->keyframe = get_bits(&gb, 1); | |
2432 s->keyframe ^= 1; | |
2433 skip_bits(&gb, 1); | |
2434 s->last_quality_index = s->quality_index; | |
2435 s->quality_index = get_bits(&gb, 6); | |
2436 if (s->quality_index != s->last_quality_index) | |
2437 init_dequantizer(s); | |
2438 | |
2439 debug_vp3(" VP3 frame #%d: Q index = %d", counter, s->quality_index); | |
2440 counter++; | |
2441 | |
2442 if (s->keyframe) { | |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
2443 |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
2444 debug_vp3(", keyframe\n"); |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
2445 /* skip the other 2 header bytes for now */ |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
2446 skip_bits(&gb, 16); |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
2447 |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2448 if (s->last_frame.data[0] == s->golden_frame.data[0]) { |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2449 if (s->golden_frame.data[0]) |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2450 avctx->release_buffer(avctx, &s->golden_frame); |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2451 } else { |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2452 if (s->golden_frame.data[0]) |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2453 avctx->release_buffer(avctx, &s->golden_frame); |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2454 if (s->last_frame.data[0]) |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2455 avctx->release_buffer(avctx, &s->last_frame); |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2456 } |
1224 | 2457 |
2458 s->golden_frame.reference = 0; | |
2459 if(avctx->get_buffer(avctx, &s->golden_frame) < 0) { | |
2460 printf("vp3: get_buffer() failed\n"); | |
2461 return -1; | |
2462 } | |
2463 | |
2464 /* golden frame is also the current frame */ | |
1227
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2465 memcpy(&s->current_frame, &s->golden_frame, sizeof(AVFrame)); |
1224 | 2466 |
2467 /* time to figure out pixel addresses? */ | |
2468 if (!s->pixel_addresses_inited) | |
2469 vp3_calculate_pixel_addresses(s); | |
2470 | |
2471 } else { | |
2472 | |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
2473 debug_vp3("\n"); |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
2474 |
1224 | 2475 /* allocate a new current frame */ |
2476 s->current_frame.reference = 0; | |
2477 if(avctx->get_buffer(avctx, &s->current_frame) < 0) { | |
2478 printf("vp3: get_buffer() failed\n"); | |
2479 return -1; | |
2480 } | |
2481 } | |
2482 | |
2483 init_frame(s, &gb); | |
2484 | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2485 #if KEYFRAMES_ONLY |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2486 if (!s->keyframe) { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2487 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2488 memcpy(s->current_frame.data[0], s->golden_frame.data[0], |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2489 s->current_frame.linesize[0] * s->height); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2490 memcpy(s->current_frame.data[1], s->golden_frame.data[1], |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2491 s->current_frame.linesize[1] * s->height / 2); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2492 memcpy(s->current_frame.data[2], s->golden_frame.data[2], |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2493 s->current_frame.linesize[2] * s->height / 2); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2494 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2495 } else { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2496 #endif |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2497 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2498 if (unpack_superblocks(s, &gb) || |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2499 unpack_modes(s, &gb) || |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2500 unpack_vectors(s, &gb) || |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2501 unpack_dct_coeffs(s, &gb)) { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2502 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2503 printf(" vp3: could not decode frame\n"); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2504 return -1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2505 } |
1224 | 2506 |
2507 reverse_dc_prediction(s, 0, s->fragment_width, s->fragment_height); | |
2508 reverse_dc_prediction(s, s->u_fragment_start, | |
2509 s->fragment_width / 2, s->fragment_height / 2); | |
2510 reverse_dc_prediction(s, s->v_fragment_start, | |
2511 s->fragment_width / 2, s->fragment_height / 2); | |
2512 | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2513 render_fragments(s, 0, s->width, s->height, 0); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2514 render_fragments(s, s->u_fragment_start, s->width / 2, s->height / 2, 1); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2515 render_fragments(s, s->v_fragment_start, s->width / 2, s->height / 2, 2); |
1224 | 2516 |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2517 #if KEYFRAMES_ONLY |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2518 } |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2519 #endif |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2520 |
1224 | 2521 *data_size=sizeof(AVFrame); |
2522 *(AVFrame*)data= s->current_frame; | |
2523 | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2524 /* release the last frame, if it is allocated and if it is not the |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2525 * golden frame */ |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2526 if ((s->last_frame.data[0]) && |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2527 (s->last_frame.data[0] != s->golden_frame.data[0])) |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2528 avctx->release_buffer(avctx, &s->last_frame); |
1224 | 2529 |
1227
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2530 /* shuffle frames (last = current) */ |
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2531 memcpy(&s->last_frame, &s->current_frame, sizeof(AVFrame)); |
1224 | 2532 |
2533 return buf_size; | |
2534 } | |
2535 | |
2536 /* | |
2537 * This is the ffmpeg/libavcodec API module cleanup function. | |
2538 */ | |
2539 static int vp3_decode_end(AVCodecContext *avctx) | |
2540 { | |
2541 Vp3DecodeContext *s = avctx->priv_data; | |
2542 | |
2543 av_free(s->all_fragments); | |
2544 av_free(s->coded_fragment_list); | |
2545 av_free(s->superblock_fragments); | |
2546 av_free(s->superblock_macroblocks); | |
2547 av_free(s->macroblock_fragments); | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
2548 av_free(s->macroblock_coding); |
1224 | 2549 |
2550 /* release all frames */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2551 if (s->golden_frame.data[0]) |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2552 avctx->release_buffer(avctx, &s->golden_frame); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2553 if (s->last_frame.data[0]) |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2554 avctx->release_buffer(avctx, &s->last_frame); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2555 /* no need to release the current_frame since it will always be pointing |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2556 * to the same frame as either the golden or last frame */ |
1224 | 2557 |
2558 return 0; | |
2559 } | |
2560 | |
2561 AVCodec vp3_decoder = { | |
2562 "vp3", | |
2563 CODEC_TYPE_VIDEO, | |
2564 CODEC_ID_VP3, | |
2565 sizeof(Vp3DecodeContext), | |
2566 vp3_decode_init, | |
2567 NULL, | |
2568 vp3_decode_end, | |
2569 vp3_decode_frame, | |
2570 0, | |
2571 NULL | |
2572 }; |