Mercurial > libavcodec.hg
annotate vp3.c @ 2709:a119d4eb53d7 libavcodec
fix 4MV MC and reinstate new MC VLC
author | melanson |
---|---|
date | Wed, 18 May 2005 17:14:59 +0000 |
parents | a23c44f7ed60 |
children | 9c1a436dac6b |
rev | line source |
---|---|
1224 | 1 /* |
1867
7f7aa6ac3723
cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents:
1864
diff
changeset
|
2 * Copyright (C) 2003-2004 the ffmpeg project |
1224 | 3 * |
4 * This library is free software; you can redistribute it and/or | |
5 * modify it under the terms of the GNU Lesser General Public | |
6 * License as published by the Free Software Foundation; either | |
7 * version 2 of the License, or (at your option) any later version. | |
8 * | |
9 * This library is distributed in the hope that it will be useful, | |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
12 * Lesser General Public License for more details. | |
13 * | |
14 * You should have received a copy of the GNU Lesser General Public | |
15 * License along with this library; if not, write to the Free Software | |
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
17 * | |
18 */ | |
19 | |
20 /** | |
21 * @file vp3.c | |
22 * On2 VP3 Video Decoder | |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
23 * |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
24 * VP3 Video Decoder by Mike Melanson (mike at multimedia.cx) |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
25 * For more information about the VP3 coding process, visit: |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
26 * http://multimedia.cx/ |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
27 * |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
28 * Theora decoder by Alex Beregszaszi |
1224 | 29 */ |
30 | |
31 #include <stdio.h> | |
32 #include <stdlib.h> | |
33 #include <string.h> | |
34 #include <unistd.h> | |
35 | |
36 #include "common.h" | |
37 #include "avcodec.h" | |
38 #include "dsputil.h" | |
39 #include "mpegvideo.h" | |
40 | |
41 #include "vp3data.h" | |
42 | |
43 #define FRAGMENT_PIXELS 8 | |
44 | |
45 /* | |
46 * Debugging Variables | |
47 * | |
48 * Define one or more of the following compile-time variables to 1 to obtain | |
49 * elaborate information about certain aspects of the decoding process. | |
50 * | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
51 * KEYFRAMES_ONLY: set this to 1 to only see keyframes (VP3 slideshow mode) |
1224 | 52 * DEBUG_VP3: high-level decoding flow |
53 * DEBUG_INIT: initialization parameters | |
54 * DEBUG_DEQUANTIZERS: display how the dequanization tables are built | |
55 * DEBUG_BLOCK_CODING: unpacking the superblock/macroblock/fragment coding | |
56 * DEBUG_MODES: unpacking the coding modes for individual fragments | |
57 * DEBUG_VECTORS: display the motion vectors | |
58 * DEBUG_TOKEN: display exhaustive information about each DCT token | |
59 * DEBUG_VLC: display the VLCs as they are extracted from the stream | |
60 * DEBUG_DC_PRED: display the process of reversing DC prediction | |
61 * DEBUG_IDCT: show every detail of the IDCT process | |
62 */ | |
63 | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
64 #define KEYFRAMES_ONLY 0 |
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
65 |
1224 | 66 #define DEBUG_VP3 0 |
67 #define DEBUG_INIT 0 | |
68 #define DEBUG_DEQUANTIZERS 0 | |
69 #define DEBUG_BLOCK_CODING 0 | |
70 #define DEBUG_MODES 0 | |
71 #define DEBUG_VECTORS 0 | |
72 #define DEBUG_TOKEN 0 | |
73 #define DEBUG_VLC 0 | |
74 #define DEBUG_DC_PRED 0 | |
75 #define DEBUG_IDCT 0 | |
76 | |
77 #if DEBUG_VP3 | |
78 #define debug_vp3 printf | |
79 #else | |
80 static inline void debug_vp3(const char *format, ...) { } | |
81 #endif | |
82 | |
83 #if DEBUG_INIT | |
84 #define debug_init printf | |
85 #else | |
86 static inline void debug_init(const char *format, ...) { } | |
87 #endif | |
88 | |
89 #if DEBUG_DEQUANTIZERS | |
90 #define debug_dequantizers printf | |
91 #else | |
92 static inline void debug_dequantizers(const char *format, ...) { } | |
93 #endif | |
94 | |
95 #if DEBUG_BLOCK_CODING | |
96 #define debug_block_coding printf | |
97 #else | |
98 static inline void debug_block_coding(const char *format, ...) { } | |
99 #endif | |
100 | |
101 #if DEBUG_MODES | |
102 #define debug_modes printf | |
103 #else | |
104 static inline void debug_modes(const char *format, ...) { } | |
105 #endif | |
106 | |
107 #if DEBUG_VECTORS | |
108 #define debug_vectors printf | |
109 #else | |
110 static inline void debug_vectors(const char *format, ...) { } | |
111 #endif | |
112 | |
113 #if DEBUG_TOKEN | |
114 #define debug_token printf | |
115 #else | |
116 static inline void debug_token(const char *format, ...) { } | |
117 #endif | |
118 | |
119 #if DEBUG_VLC | |
120 #define debug_vlc printf | |
121 #else | |
122 static inline void debug_vlc(const char *format, ...) { } | |
123 #endif | |
124 | |
125 #if DEBUG_DC_PRED | |
126 #define debug_dc_pred printf | |
127 #else | |
128 static inline void debug_dc_pred(const char *format, ...) { } | |
129 #endif | |
130 | |
131 #if DEBUG_IDCT | |
132 #define debug_idct printf | |
133 #else | |
134 static inline void debug_idct(const char *format, ...) { } | |
135 #endif | |
136 | |
137 typedef struct Vp3Fragment { | |
2689
ed0ab6f82167
clear blocks after each idct instead of per picture
michael
parents:
2687
diff
changeset
|
138 DCTELEM *coeffs; |
1224 | 139 /* address of first pixel taking into account which plane the fragment |
140 * lives on as well as the plane stride */ | |
141 int first_pixel; | |
142 /* this is the macroblock that the fragment belongs to */ | |
2706 | 143 uint16_t macroblock; |
144 uint8_t coding_method; | |
145 uint8_t coeff_count; | |
146 int8_t last_coeff; | |
147 int8_t motion_x; | |
148 int8_t motion_y; | |
1224 | 149 } Vp3Fragment; |
150 | |
151 #define SB_NOT_CODED 0 | |
152 #define SB_PARTIALLY_CODED 1 | |
153 #define SB_FULLY_CODED 2 | |
154 | |
155 #define MODE_INTER_NO_MV 0 | |
156 #define MODE_INTRA 1 | |
157 #define MODE_INTER_PLUS_MV 2 | |
158 #define MODE_INTER_LAST_MV 3 | |
159 #define MODE_INTER_PRIOR_LAST 4 | |
160 #define MODE_USING_GOLDEN 5 | |
161 #define MODE_GOLDEN_MV 6 | |
162 #define MODE_INTER_FOURMV 7 | |
163 #define CODING_MODE_COUNT 8 | |
164 | |
165 /* special internal mode */ | |
166 #define MODE_COPY 8 | |
167 | |
168 /* There are 6 preset schemes, plus a free-form scheme */ | |
169 static int ModeAlphabet[7][CODING_MODE_COUNT] = | |
170 { | |
171 /* this is the custom scheme */ | |
172 { 0, 0, 0, 0, 0, 0, 0, 0 }, | |
173 | |
174 /* scheme 1: Last motion vector dominates */ | |
175 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, | |
176 MODE_INTER_PLUS_MV, MODE_INTER_NO_MV, | |
177 MODE_INTRA, MODE_USING_GOLDEN, | |
178 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
179 | |
180 /* scheme 2 */ | |
181 { MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, | |
182 MODE_INTER_NO_MV, MODE_INTER_PLUS_MV, | |
183 MODE_INTRA, MODE_USING_GOLDEN, | |
184 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
185 | |
186 /* scheme 3 */ | |
187 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV, | |
188 MODE_INTER_PRIOR_LAST, MODE_INTER_NO_MV, | |
189 MODE_INTRA, MODE_USING_GOLDEN, | |
190 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
191 | |
192 /* scheme 4 */ | |
193 { MODE_INTER_LAST_MV, MODE_INTER_PLUS_MV, | |
194 MODE_INTER_NO_MV, MODE_INTER_PRIOR_LAST, | |
195 MODE_INTRA, MODE_USING_GOLDEN, | |
196 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
197 | |
198 /* scheme 5: No motion vector dominates */ | |
199 { MODE_INTER_NO_MV, MODE_INTER_LAST_MV, | |
200 MODE_INTER_PRIOR_LAST, MODE_INTER_PLUS_MV, | |
201 MODE_INTRA, MODE_USING_GOLDEN, | |
202 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
203 | |
204 /* scheme 6 */ | |
205 { MODE_INTER_NO_MV, MODE_USING_GOLDEN, | |
206 MODE_INTER_LAST_MV, MODE_INTER_PRIOR_LAST, | |
207 MODE_INTER_PLUS_MV, MODE_INTRA, | |
208 MODE_GOLDEN_MV, MODE_INTER_FOURMV }, | |
209 | |
210 }; | |
211 | |
212 #define MIN_DEQUANT_VAL 2 | |
213 | |
214 typedef struct Vp3DecodeContext { | |
215 AVCodecContext *avctx; | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
216 int theora, theora_tables; |
1664 | 217 int version; |
1224 | 218 int width, height; |
219 AVFrame golden_frame; | |
220 AVFrame last_frame; | |
221 AVFrame current_frame; | |
222 int keyframe; | |
223 DSPContext dsp; | |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
224 int flipped_image; |
1224 | 225 |
226 int quality_index; | |
227 int last_quality_index; | |
228 | |
229 int superblock_count; | |
230 int superblock_width; | |
231 int superblock_height; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
232 int y_superblock_width; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
233 int y_superblock_height; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
234 int c_superblock_width; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
235 int c_superblock_height; |
1224 | 236 int u_superblock_start; |
237 int v_superblock_start; | |
238 unsigned char *superblock_coding; | |
239 | |
240 int macroblock_count; | |
241 int macroblock_width; | |
242 int macroblock_height; | |
243 | |
244 int fragment_count; | |
245 int fragment_width; | |
246 int fragment_height; | |
247 | |
248 Vp3Fragment *all_fragments; | |
2689
ed0ab6f82167
clear blocks after each idct instead of per picture
michael
parents:
2687
diff
changeset
|
249 DCTELEM *coeffs; |
1224 | 250 int u_fragment_start; |
251 int v_fragment_start; | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
252 |
2694 | 253 ScanTable scantable; |
254 | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
255 /* tables */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
256 uint16_t coded_dc_scale_factor[64]; |
1867
7f7aa6ac3723
cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents:
1864
diff
changeset
|
257 uint32_t coded_ac_scale_factor[64]; |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
258 uint16_t coded_intra_y_dequant[64]; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
259 uint16_t coded_intra_c_dequant[64]; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
260 uint16_t coded_inter_dequant[64]; |
1224 | 261 |
262 /* this is a list of indices into the all_fragments array indicating | |
263 * which of the fragments are coded */ | |
264 int *coded_fragment_list; | |
265 int coded_fragment_list_index; | |
266 int pixel_addresses_inited; | |
267 | |
268 VLC dc_vlc[16]; | |
269 VLC ac_vlc_1[16]; | |
270 VLC ac_vlc_2[16]; | |
271 VLC ac_vlc_3[16]; | |
272 VLC ac_vlc_4[16]; | |
273 | |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
274 VLC superblock_run_length_vlc; |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
275 VLC fragment_run_length_vlc; |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
276 VLC mode_code_vlc; |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
277 VLC motion_vector_vlc; |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
278 |
1972 | 279 /* these arrays need to be on 16-byte boundaries since SSE2 operations |
280 * index into them */ | |
281 int16_t __align16 intra_y_dequant[64]; | |
282 int16_t __align16 intra_c_dequant[64]; | |
283 int16_t __align16 inter_dequant[64]; | |
1224 | 284 |
285 /* This table contains superblock_count * 16 entries. Each set of 16 | |
286 * numbers corresponds to the fragment indices 0..15 of the superblock. | |
287 * An entry will be -1 to indicate that no entry corresponds to that | |
288 * index. */ | |
289 int *superblock_fragments; | |
290 | |
291 /* This table contains superblock_count * 4 entries. Each set of 4 | |
292 * numbers corresponds to the macroblock indices 0..3 of the superblock. | |
293 * An entry will be -1 to indicate that no entry corresponds to that | |
294 * index. */ | |
295 int *superblock_macroblocks; | |
296 | |
297 /* This table contains macroblock_count * 6 entries. Each set of 6 | |
298 * numbers corresponds to the fragment indices 0..5 which comprise | |
299 * the macroblock (4 Y fragments and 2 C fragments). */ | |
300 int *macroblock_fragments; | |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
301 /* 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
|
302 * is coded. */ |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
303 unsigned char *macroblock_coding; |
1224 | 304 |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
305 int first_coded_y_fragment; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
306 int first_coded_c_fragment; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
307 int last_coded_y_fragment; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
308 int last_coded_c_fragment; |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
309 |
1406 | 310 uint8_t edge_emu_buffer[9*2048]; //FIXME dynamic alloc |
1407 | 311 uint8_t qscale_table[2048]; //FIXME dynamic alloc (width+15)/16 |
1224 | 312 } Vp3DecodeContext; |
313 | |
1664 | 314 static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb); |
315 static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb); | |
316 | |
1224 | 317 /************************************************************************ |
318 * VP3 specific functions | |
319 ************************************************************************/ | |
320 | |
321 /* | |
322 * This function sets up all of the various blocks mappings: | |
323 * superblocks <-> fragments, macroblocks <-> fragments, | |
324 * superblocks <-> macroblocks | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
325 * |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
326 * Returns 0 is successful; returns 1 if *anything* went wrong. |
1224 | 327 */ |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
328 static int init_block_mapping(Vp3DecodeContext *s) |
1224 | 329 { |
330 int i, j; | |
331 signed int hilbert_walk_y[16]; | |
332 signed int hilbert_walk_c[16]; | |
333 signed int hilbert_walk_mb[4]; | |
334 | |
335 int current_fragment = 0; | |
336 int current_width = 0; | |
337 int current_height = 0; | |
338 int right_edge = 0; | |
339 int bottom_edge = 0; | |
340 int superblock_row_inc = 0; | |
341 int *hilbert = NULL; | |
342 int mapping_index = 0; | |
343 | |
344 int current_macroblock; | |
345 int c_fragment; | |
346 | |
347 signed char travel_width[16] = { | |
348 1, 1, 0, -1, | |
349 0, 0, 1, 0, | |
350 1, 0, 1, 0, | |
351 0, -1, 0, 1 | |
352 }; | |
353 | |
354 signed char travel_height[16] = { | |
355 0, 0, 1, 0, | |
356 1, 1, 0, -1, | |
357 0, 1, 0, -1, | |
358 -1, 0, -1, 0 | |
359 }; | |
360 | |
361 signed char travel_width_mb[4] = { | |
362 1, 0, 1, 0 | |
363 }; | |
364 | |
365 signed char travel_height_mb[4] = { | |
366 0, 1, 0, -1 | |
367 }; | |
368 | |
369 debug_vp3(" vp3: initialize block mapping tables\n"); | |
370 | |
371 /* figure out hilbert pattern per these frame dimensions */ | |
372 hilbert_walk_y[0] = 1; | |
373 hilbert_walk_y[1] = 1; | |
374 hilbert_walk_y[2] = s->fragment_width; | |
375 hilbert_walk_y[3] = -1; | |
376 hilbert_walk_y[4] = s->fragment_width; | |
377 hilbert_walk_y[5] = s->fragment_width; | |
378 hilbert_walk_y[6] = 1; | |
379 hilbert_walk_y[7] = -s->fragment_width; | |
380 hilbert_walk_y[8] = 1; | |
381 hilbert_walk_y[9] = s->fragment_width; | |
382 hilbert_walk_y[10] = 1; | |
383 hilbert_walk_y[11] = -s->fragment_width; | |
384 hilbert_walk_y[12] = -s->fragment_width; | |
385 hilbert_walk_y[13] = -1; | |
386 hilbert_walk_y[14] = -s->fragment_width; | |
387 hilbert_walk_y[15] = 1; | |
388 | |
389 hilbert_walk_c[0] = 1; | |
390 hilbert_walk_c[1] = 1; | |
391 hilbert_walk_c[2] = s->fragment_width / 2; | |
392 hilbert_walk_c[3] = -1; | |
393 hilbert_walk_c[4] = s->fragment_width / 2; | |
394 hilbert_walk_c[5] = s->fragment_width / 2; | |
395 hilbert_walk_c[6] = 1; | |
396 hilbert_walk_c[7] = -s->fragment_width / 2; | |
397 hilbert_walk_c[8] = 1; | |
398 hilbert_walk_c[9] = s->fragment_width / 2; | |
399 hilbert_walk_c[10] = 1; | |
400 hilbert_walk_c[11] = -s->fragment_width / 2; | |
401 hilbert_walk_c[12] = -s->fragment_width / 2; | |
402 hilbert_walk_c[13] = -1; | |
403 hilbert_walk_c[14] = -s->fragment_width / 2; | |
404 hilbert_walk_c[15] = 1; | |
405 | |
406 hilbert_walk_mb[0] = 1; | |
407 hilbert_walk_mb[1] = s->macroblock_width; | |
408 hilbert_walk_mb[2] = 1; | |
409 hilbert_walk_mb[3] = -s->macroblock_width; | |
410 | |
411 /* iterate through each superblock (all planes) and map the fragments */ | |
412 for (i = 0; i < s->superblock_count; i++) { | |
413 debug_init(" superblock %d (u starts @ %d, v starts @ %d)\n", | |
414 i, s->u_superblock_start, s->v_superblock_start); | |
415 | |
416 /* time to re-assign the limits? */ | |
417 if (i == 0) { | |
418 | |
419 /* start of Y superblocks */ | |
420 right_edge = s->fragment_width; | |
421 bottom_edge = s->fragment_height; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
422 current_width = -1; |
1224 | 423 current_height = 0; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
424 superblock_row_inc = 3 * s->fragment_width - |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
425 (s->y_superblock_width * 4 - s->fragment_width); |
1224 | 426 hilbert = hilbert_walk_y; |
427 | |
428 /* the first operation for this variable is to advance by 1 */ | |
429 current_fragment = -1; | |
430 | |
431 } else if (i == s->u_superblock_start) { | |
432 | |
433 /* start of U superblocks */ | |
434 right_edge = s->fragment_width / 2; | |
435 bottom_edge = s->fragment_height / 2; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
436 current_width = -1; |
1224 | 437 current_height = 0; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
438 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
|
439 (s->c_superblock_width * 4 - s->fragment_width / 2); |
1224 | 440 hilbert = hilbert_walk_c; |
441 | |
442 /* the first operation for this variable is to advance by 1 */ | |
443 current_fragment = s->u_fragment_start - 1; | |
444 | |
445 } else if (i == s->v_superblock_start) { | |
446 | |
447 /* start of V superblocks */ | |
448 right_edge = s->fragment_width / 2; | |
449 bottom_edge = s->fragment_height / 2; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
450 current_width = -1; |
1224 | 451 current_height = 0; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
452 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
|
453 (s->c_superblock_width * 4 - s->fragment_width / 2); |
1224 | 454 hilbert = hilbert_walk_c; |
455 | |
456 /* the first operation for this variable is to advance by 1 */ | |
457 current_fragment = s->v_fragment_start - 1; | |
458 | |
459 } | |
460 | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
461 if (current_width >= right_edge - 1) { |
1224 | 462 /* 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
|
463 current_width = -1; |
1224 | 464 current_height += 4; |
465 | |
466 /* fragment is now at the start of a new superblock row */ | |
467 current_fragment += superblock_row_inc; | |
468 } | |
469 | |
470 /* iterate through all 16 fragments in a superblock */ | |
471 for (j = 0; j < 16; j++) { | |
472 current_fragment += hilbert[j]; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
473 current_width += travel_width[j]; |
1224 | 474 current_height += travel_height[j]; |
475 | |
476 /* 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
|
477 if ((current_width < right_edge) && |
1224 | 478 (current_height < bottom_edge)) { |
479 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
|
480 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
|
481 s->superblock_fragments[mapping_index], i, j, |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
482 current_width, right_edge, current_height, bottom_edge); |
1224 | 483 } else { |
484 s->superblock_fragments[mapping_index] = -1; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
485 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
|
486 i, j, |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
487 current_width, right_edge, current_height, bottom_edge); |
1224 | 488 } |
489 | |
490 mapping_index++; | |
491 } | |
492 } | |
493 | |
494 /* initialize the superblock <-> macroblock mapping; iterate through | |
495 * all of the Y plane superblocks to build this mapping */ | |
496 right_edge = s->macroblock_width; | |
497 bottom_edge = s->macroblock_height; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
498 current_width = -1; |
1224 | 499 current_height = 0; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
500 superblock_row_inc = s->macroblock_width - |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
501 (s->y_superblock_width * 2 - s->macroblock_width);; |
1224 | 502 hilbert = hilbert_walk_mb; |
503 mapping_index = 0; | |
504 current_macroblock = -1; | |
505 for (i = 0; i < s->u_superblock_start; i++) { | |
506 | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
507 if (current_width >= right_edge - 1) { |
1224 | 508 /* reset width and move to next superblock row */ |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
509 current_width = -1; |
1224 | 510 current_height += 2; |
511 | |
512 /* macroblock is now at the start of a new superblock row */ | |
513 current_macroblock += superblock_row_inc; | |
514 } | |
515 | |
516 /* iterate through each potential macroblock in the superblock */ | |
517 for (j = 0; j < 4; j++) { | |
518 current_macroblock += hilbert_walk_mb[j]; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
519 current_width += travel_width_mb[j]; |
1224 | 520 current_height += travel_height_mb[j]; |
521 | |
522 /* 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
|
523 if ((current_width < right_edge) && |
1224 | 524 (current_height < bottom_edge)) { |
525 s->superblock_macroblocks[mapping_index] = current_macroblock; | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
526 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
|
527 s->superblock_macroblocks[mapping_index], i, j, |
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
528 current_width, right_edge, current_height, bottom_edge); |
1224 | 529 } else { |
530 s->superblock_macroblocks[mapping_index] = -1; | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
531 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
|
532 i, j, |
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
533 current_width, right_edge, current_height, bottom_edge); |
1224 | 534 } |
535 | |
536 mapping_index++; | |
537 } | |
538 } | |
539 | |
540 /* initialize the macroblock <-> fragment mapping */ | |
541 current_fragment = 0; | |
542 current_macroblock = 0; | |
543 mapping_index = 0; | |
544 for (i = 0; i < s->fragment_height; i += 2) { | |
545 | |
546 for (j = 0; j < s->fragment_width; j += 2) { | |
547 | |
548 debug_init(" macroblock %d contains fragments: ", current_macroblock); | |
549 s->all_fragments[current_fragment].macroblock = current_macroblock; | |
550 s->macroblock_fragments[mapping_index++] = current_fragment; | |
551 debug_init("%d ", current_fragment); | |
552 | |
553 if (j + 1 < s->fragment_width) { | |
554 s->all_fragments[current_fragment + 1].macroblock = current_macroblock; | |
555 s->macroblock_fragments[mapping_index++] = current_fragment + 1; | |
556 debug_init("%d ", current_fragment + 1); | |
557 } else | |
558 s->macroblock_fragments[mapping_index++] = -1; | |
559 | |
560 if (i + 1 < s->fragment_height) { | |
561 s->all_fragments[current_fragment + s->fragment_width].macroblock = | |
562 current_macroblock; | |
563 s->macroblock_fragments[mapping_index++] = | |
564 current_fragment + s->fragment_width; | |
565 debug_init("%d ", current_fragment + s->fragment_width); | |
566 } else | |
567 s->macroblock_fragments[mapping_index++] = -1; | |
568 | |
569 if ((j + 1 < s->fragment_width) && (i + 1 < s->fragment_height)) { | |
570 s->all_fragments[current_fragment + s->fragment_width + 1].macroblock = | |
571 current_macroblock; | |
572 s->macroblock_fragments[mapping_index++] = | |
573 current_fragment + s->fragment_width + 1; | |
574 debug_init("%d ", current_fragment + s->fragment_width + 1); | |
575 } else | |
576 s->macroblock_fragments[mapping_index++] = -1; | |
577 | |
578 /* C planes */ | |
579 c_fragment = s->u_fragment_start + | |
580 (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
|
581 s->all_fragments[c_fragment].macroblock = s->macroblock_count; |
1224 | 582 s->macroblock_fragments[mapping_index++] = c_fragment; |
583 debug_init("%d ", c_fragment); | |
584 | |
585 c_fragment = s->v_fragment_start + | |
586 (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
|
587 s->all_fragments[c_fragment].macroblock = s->macroblock_count; |
1224 | 588 s->macroblock_fragments[mapping_index++] = c_fragment; |
589 debug_init("%d ", c_fragment); | |
590 | |
591 debug_init("\n"); | |
592 | |
593 if (j + 2 <= s->fragment_width) | |
594 current_fragment += 2; | |
595 else | |
596 current_fragment++; | |
597 current_macroblock++; | |
598 } | |
599 | |
600 current_fragment += s->fragment_width; | |
601 } | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
602 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
603 return 0; /* successful path out */ |
1224 | 604 } |
605 | |
606 /* | |
607 * This function unpacks a single token (which should be in the range 0..31) | |
608 * and returns a zero run (number of zero coefficients in current DCT matrix | |
609 * before next non-zero coefficient), the next DCT coefficient, and the | |
610 * number of consecutive, non-EOB'd DCT blocks to EOB. | |
611 */ | |
612 static void unpack_token(GetBitContext *gb, int token, int *zero_run, | |
613 DCTELEM *coeff, int *eob_run) | |
614 { | |
615 int sign; | |
616 | |
617 *zero_run = 0; | |
618 *eob_run = 0; | |
619 *coeff = 0; | |
620 | |
621 debug_token(" vp3 token %d: ", token); | |
622 switch (token) { | |
623 | |
624 case 0: | |
625 debug_token("DCT_EOB_TOKEN, EOB next block\n"); | |
626 *eob_run = 1; | |
627 break; | |
628 | |
629 case 1: | |
630 debug_token("DCT_EOB_PAIR_TOKEN, EOB next 2 blocks\n"); | |
631 *eob_run = 2; | |
632 break; | |
633 | |
634 case 2: | |
635 debug_token("DCT_EOB_TRIPLE_TOKEN, EOB next 3 blocks\n"); | |
636 *eob_run = 3; | |
637 break; | |
638 | |
639 case 3: | |
640 debug_token("DCT_REPEAT_RUN_TOKEN, "); | |
641 *eob_run = get_bits(gb, 2) + 4; | |
642 debug_token("EOB the next %d blocks\n", *eob_run); | |
643 break; | |
644 | |
645 case 4: | |
646 debug_token("DCT_REPEAT_RUN2_TOKEN, "); | |
647 *eob_run = get_bits(gb, 3) + 8; | |
648 debug_token("EOB the next %d blocks\n", *eob_run); | |
649 break; | |
650 | |
651 case 5: | |
652 debug_token("DCT_REPEAT_RUN3_TOKEN, "); | |
653 *eob_run = get_bits(gb, 4) + 16; | |
654 debug_token("EOB the next %d blocks\n", *eob_run); | |
655 break; | |
656 | |
657 case 6: | |
658 debug_token("DCT_REPEAT_RUN4_TOKEN, "); | |
659 *eob_run = get_bits(gb, 12); | |
660 debug_token("EOB the next %d blocks\n", *eob_run); | |
661 break; | |
662 | |
663 case 7: | |
664 debug_token("DCT_SHORT_ZRL_TOKEN, "); | |
665 /* note that this token actually indicates that (3 extra bits) + 1 0s | |
666 * should be output; this case specifies a run of (3 EBs) 0s and a | |
667 * coefficient of 0. */ | |
668 *zero_run = get_bits(gb, 3); | |
669 *coeff = 0; | |
670 debug_token("skip the next %d positions in output matrix\n", *zero_run + 1); | |
671 break; | |
672 | |
673 case 8: | |
674 debug_token("DCT_ZRL_TOKEN, "); | |
675 /* note that this token actually indicates that (6 extra bits) + 1 0s | |
676 * should be output; this case specifies a run of (6 EBs) 0s and a | |
677 * coefficient of 0. */ | |
678 *zero_run = get_bits(gb, 6); | |
679 *coeff = 0; | |
680 debug_token("skip the next %d positions in output matrix\n", *zero_run + 1); | |
681 break; | |
682 | |
683 case 9: | |
684 debug_token("ONE_TOKEN, output 1\n"); | |
685 *coeff = 1; | |
686 break; | |
687 | |
688 case 10: | |
689 debug_token("MINUS_ONE_TOKEN, output -1\n"); | |
690 *coeff = -1; | |
691 break; | |
692 | |
693 case 11: | |
694 debug_token("TWO_TOKEN, output 2\n"); | |
695 *coeff = 2; | |
696 break; | |
697 | |
698 case 12: | |
699 debug_token("MINUS_TWO_TOKEN, output -2\n"); | |
700 *coeff = -2; | |
701 break; | |
702 | |
703 case 13: | |
704 case 14: | |
705 case 15: | |
706 case 16: | |
707 debug_token("LOW_VAL_TOKENS, "); | |
708 if (get_bits(gb, 1)) | |
709 *coeff = -(3 + (token - 13)); | |
710 else | |
711 *coeff = 3 + (token - 13); | |
712 debug_token("output %d\n", *coeff); | |
713 break; | |
714 | |
715 case 17: | |
716 debug_token("DCT_VAL_CATEGORY3, "); | |
717 sign = get_bits(gb, 1); | |
718 *coeff = 7 + get_bits(gb, 1); | |
719 if (sign) | |
720 *coeff = -(*coeff); | |
721 debug_token("output %d\n", *coeff); | |
722 break; | |
723 | |
724 case 18: | |
725 debug_token("DCT_VAL_CATEGORY4, "); | |
726 sign = get_bits(gb, 1); | |
727 *coeff = 9 + get_bits(gb, 2); | |
728 if (sign) | |
729 *coeff = -(*coeff); | |
730 debug_token("output %d\n", *coeff); | |
731 break; | |
732 | |
733 case 19: | |
734 debug_token("DCT_VAL_CATEGORY5, "); | |
735 sign = get_bits(gb, 1); | |
736 *coeff = 13 + get_bits(gb, 3); | |
737 if (sign) | |
738 *coeff = -(*coeff); | |
739 debug_token("output %d\n", *coeff); | |
740 break; | |
741 | |
742 case 20: | |
743 debug_token("DCT_VAL_CATEGORY6, "); | |
744 sign = get_bits(gb, 1); | |
745 *coeff = 21 + get_bits(gb, 4); | |
746 if (sign) | |
747 *coeff = -(*coeff); | |
748 debug_token("output %d\n", *coeff); | |
749 break; | |
750 | |
751 case 21: | |
752 debug_token("DCT_VAL_CATEGORY7, "); | |
753 sign = get_bits(gb, 1); | |
754 *coeff = 37 + get_bits(gb, 5); | |
755 if (sign) | |
756 *coeff = -(*coeff); | |
757 debug_token("output %d\n", *coeff); | |
758 break; | |
759 | |
760 case 22: | |
761 debug_token("DCT_VAL_CATEGORY8, "); | |
762 sign = get_bits(gb, 1); | |
763 *coeff = 69 + get_bits(gb, 9); | |
764 if (sign) | |
765 *coeff = -(*coeff); | |
766 debug_token("output %d\n", *coeff); | |
767 break; | |
768 | |
769 case 23: | |
770 case 24: | |
771 case 25: | |
772 case 26: | |
773 case 27: | |
774 debug_token("DCT_RUN_CATEGORY1, "); | |
775 *zero_run = token - 22; | |
776 if (get_bits(gb, 1)) | |
777 *coeff = -1; | |
778 else | |
779 *coeff = 1; | |
780 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
781 break; | |
782 | |
783 case 28: | |
784 debug_token("DCT_RUN_CATEGORY1B, "); | |
785 if (get_bits(gb, 1)) | |
786 *coeff = -1; | |
787 else | |
788 *coeff = 1; | |
789 *zero_run = 6 + get_bits(gb, 2); | |
790 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
791 break; | |
792 | |
793 case 29: | |
794 debug_token("DCT_RUN_CATEGORY1C, "); | |
795 if (get_bits(gb, 1)) | |
796 *coeff = -1; | |
797 else | |
798 *coeff = 1; | |
799 *zero_run = 10 + get_bits(gb, 3); | |
800 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
801 break; | |
802 | |
803 case 30: | |
804 debug_token("DCT_RUN_CATEGORY2, "); | |
805 sign = get_bits(gb, 1); | |
806 *coeff = 2 + get_bits(gb, 1); | |
807 if (sign) | |
808 *coeff = -(*coeff); | |
809 *zero_run = 1; | |
810 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
811 break; | |
812 | |
813 case 31: | |
814 debug_token("DCT_RUN_CATEGORY2, "); | |
815 sign = get_bits(gb, 1); | |
816 *coeff = 2 + get_bits(gb, 1); | |
817 if (sign) | |
818 *coeff = -(*coeff); | |
819 *zero_run = 2 + get_bits(gb, 1); | |
820 debug_token("output %d 0s, then %d\n", *zero_run, *coeff); | |
821 break; | |
822 | |
823 default: | |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
824 av_log(NULL, AV_LOG_ERROR, " vp3: help! Got a bad token: %d > 31\n", token); |
1224 | 825 break; |
826 | |
827 } | |
828 } | |
829 | |
830 /* | |
831 * This function wipes out all of the fragment data. | |
832 */ | |
833 static void init_frame(Vp3DecodeContext *s, GetBitContext *gb) | |
834 { | |
835 int i; | |
2689
ed0ab6f82167
clear blocks after each idct instead of per picture
michael
parents:
2687
diff
changeset
|
836 static const DCTELEM zero_block[64]; |
1224 | 837 |
838 /* zero out all of the fragment information */ | |
839 s->coded_fragment_list_index = 0; | |
840 for (i = 0; i < s->fragment_count; i++) { | |
2689
ed0ab6f82167
clear blocks after each idct instead of per picture
michael
parents:
2687
diff
changeset
|
841 s->all_fragments[i].coeffs = zero_block; |
1224 | 842 s->all_fragments[i].coeff_count = 0; |
2690 | 843 s->all_fragments[i].last_coeff = -1; |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
844 s->all_fragments[i].motion_x = 0xbeef; |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
845 s->all_fragments[i].motion_y = 0xbeef; |
1224 | 846 } |
847 } | |
848 | |
849 /* | |
850 * This function sets of the dequantization tables used for a particular | |
851 * frame. | |
852 */ | |
853 static void init_dequantizer(Vp3DecodeContext *s) | |
854 { | |
855 | |
1867
7f7aa6ac3723
cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents:
1864
diff
changeset
|
856 int ac_scale_factor = s->coded_ac_scale_factor[s->quality_index]; |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
857 int dc_scale_factor = s->coded_dc_scale_factor[s->quality_index]; |
1224 | 858 int i, j; |
859 | |
860 debug_vp3(" vp3: initializing dequantization tables\n"); | |
861 | |
862 /* | |
863 * Scale dequantizers: | |
864 * | |
865 * quantizer * sf | |
866 * -------------- | |
867 * 100 | |
868 * | |
869 * where sf = dc_scale_factor for DC quantizer | |
1867
7f7aa6ac3723
cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents:
1864
diff
changeset
|
870 * or ac_scale_factor for AC quantizer |
1224 | 871 * |
872 * Then, saturate the result to a lower limit of MIN_DEQUANT_VAL. | |
873 */ | |
1355
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
874 #define SCALER 4 |
1224 | 875 |
876 /* scale DC quantizers */ | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
877 s->intra_y_dequant[0] = s->coded_intra_y_dequant[0] * dc_scale_factor / 100; |
1224 | 878 if (s->intra_y_dequant[0] < MIN_DEQUANT_VAL * 2) |
879 s->intra_y_dequant[0] = MIN_DEQUANT_VAL * 2; | |
880 s->intra_y_dequant[0] *= SCALER; | |
881 | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
882 s->intra_c_dequant[0] = s->coded_intra_c_dequant[0] * dc_scale_factor / 100; |
1224 | 883 if (s->intra_c_dequant[0] < MIN_DEQUANT_VAL * 2) |
884 s->intra_c_dequant[0] = MIN_DEQUANT_VAL * 2; | |
885 s->intra_c_dequant[0] *= SCALER; | |
886 | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
887 s->inter_dequant[0] = s->coded_inter_dequant[0] * dc_scale_factor / 100; |
1224 | 888 if (s->inter_dequant[0] < MIN_DEQUANT_VAL * 4) |
889 s->inter_dequant[0] = MIN_DEQUANT_VAL * 4; | |
890 s->inter_dequant[0] *= SCALER; | |
891 | |
892 /* scale AC quantizers, zigzag at the same time in preparation for | |
893 * the dequantization phase */ | |
894 for (i = 1; i < 64; i++) { | |
2694 | 895 int k= s->scantable.scantable[i]; |
896 j = s->scantable.permutated[i]; | |
897 | |
898 s->intra_y_dequant[j] = s->coded_intra_y_dequant[k] * ac_scale_factor / 100; | |
1224 | 899 if (s->intra_y_dequant[j] < MIN_DEQUANT_VAL) |
900 s->intra_y_dequant[j] = MIN_DEQUANT_VAL; | |
901 s->intra_y_dequant[j] *= SCALER; | |
902 | |
2694 | 903 s->intra_c_dequant[j] = s->coded_intra_c_dequant[k] * ac_scale_factor / 100; |
1224 | 904 if (s->intra_c_dequant[j] < MIN_DEQUANT_VAL) |
905 s->intra_c_dequant[j] = MIN_DEQUANT_VAL; | |
906 s->intra_c_dequant[j] *= SCALER; | |
907 | |
2694 | 908 s->inter_dequant[j] = s->coded_inter_dequant[k] * ac_scale_factor / 100; |
1224 | 909 if (s->inter_dequant[j] < MIN_DEQUANT_VAL * 2) |
910 s->inter_dequant[j] = MIN_DEQUANT_VAL * 2; | |
911 s->inter_dequant[j] *= SCALER; | |
912 } | |
1407 | 913 |
914 memset(s->qscale_table, (FFMAX(s->intra_y_dequant[1], s->intra_c_dequant[1])+8)/16, 512); //FIXME finetune | |
1224 | 915 |
916 /* print debug information as requested */ | |
917 debug_dequantizers("intra Y dequantizers:\n"); | |
918 for (i = 0; i < 8; i++) { | |
919 for (j = i * 8; j < i * 8 + 8; j++) { | |
920 debug_dequantizers(" %4d,", s->intra_y_dequant[j]); | |
921 } | |
922 debug_dequantizers("\n"); | |
923 } | |
924 debug_dequantizers("\n"); | |
925 | |
926 debug_dequantizers("intra C dequantizers:\n"); | |
927 for (i = 0; i < 8; i++) { | |
928 for (j = i * 8; j < i * 8 + 8; j++) { | |
929 debug_dequantizers(" %4d,", s->intra_c_dequant[j]); | |
930 } | |
931 debug_dequantizers("\n"); | |
932 } | |
933 debug_dequantizers("\n"); | |
934 | |
935 debug_dequantizers("interframe dequantizers:\n"); | |
936 for (i = 0; i < 8; i++) { | |
937 for (j = i * 8; j < i * 8 + 8; j++) { | |
938 debug_dequantizers(" %4d,", s->inter_dequant[j]); | |
939 } | |
940 debug_dequantizers("\n"); | |
941 } | |
942 debug_dequantizers("\n"); | |
943 } | |
944 | |
945 /* | |
946 * This function is used to fetch runs of 1s or 0s from the bitstream for | |
947 * use in determining which superblocks are fully and partially coded. | |
948 * | |
949 * Codeword RunLength | |
950 * 0 1 | |
951 * 10x 2-3 | |
952 * 110x 4-5 | |
953 * 1110xx 6-9 | |
954 * 11110xxx 10-17 | |
955 * 111110xxxx 18-33 | |
956 * 111111xxxxxxxxxxxx 34-4129 | |
957 */ | |
958 static int get_superblock_run_length(GetBitContext *gb) | |
959 { | |
960 | |
961 if (get_bits(gb, 1) == 0) | |
962 return 1; | |
963 | |
964 else if (get_bits(gb, 1) == 0) | |
965 return (2 + get_bits(gb, 1)); | |
966 | |
967 else if (get_bits(gb, 1) == 0) | |
968 return (4 + get_bits(gb, 1)); | |
969 | |
970 else if (get_bits(gb, 1) == 0) | |
971 return (6 + get_bits(gb, 2)); | |
972 | |
973 else if (get_bits(gb, 1) == 0) | |
974 return (10 + get_bits(gb, 3)); | |
975 | |
976 else if (get_bits(gb, 1) == 0) | |
977 return (18 + get_bits(gb, 4)); | |
978 | |
979 else | |
980 return (34 + get_bits(gb, 12)); | |
981 | |
982 } | |
983 | |
984 /* | |
985 * This function is used to fetch runs of 1s or 0s from the bitstream for | |
986 * use in determining which particular fragments are coded. | |
987 * | |
988 * Codeword RunLength | |
989 * 0x 1-2 | |
990 * 10x 3-4 | |
991 * 110x 5-6 | |
992 * 1110xx 7-10 | |
993 * 11110xx 11-14 | |
994 * 11111xxxx 15-30 | |
995 */ | |
996 static int get_fragment_run_length(GetBitContext *gb) | |
997 { | |
998 | |
999 if (get_bits(gb, 1) == 0) | |
1000 return (1 + get_bits(gb, 1)); | |
1001 | |
1002 else if (get_bits(gb, 1) == 0) | |
1003 return (3 + get_bits(gb, 1)); | |
1004 | |
1005 else if (get_bits(gb, 1) == 0) | |
1006 return (5 + get_bits(gb, 1)); | |
1007 | |
1008 else if (get_bits(gb, 1) == 0) | |
1009 return (7 + get_bits(gb, 2)); | |
1010 | |
1011 else if (get_bits(gb, 1) == 0) | |
1012 return (11 + get_bits(gb, 2)); | |
1013 | |
1014 else | |
1015 return (15 + get_bits(gb, 4)); | |
1016 | |
1017 } | |
1018 | |
1019 /* | |
1020 * This function decodes a VLC from the bitstream and returns a number | |
1021 * that ranges from 0..7. The number indicates which of the 8 coding | |
1022 * modes to use. | |
1023 * | |
1024 * VLC Number | |
1025 * 0 0 | |
1026 * 10 1 | |
1027 * 110 2 | |
1028 * 1110 3 | |
1029 * 11110 4 | |
1030 * 111110 5 | |
1031 * 1111110 6 | |
1032 * 1111111 7 | |
1033 * | |
1034 */ | |
1035 static int get_mode_code(GetBitContext *gb) | |
1036 { | |
1037 | |
1038 if (get_bits(gb, 1) == 0) | |
1039 return 0; | |
1040 | |
1041 else if (get_bits(gb, 1) == 0) | |
1042 return 1; | |
1043 | |
1044 else if (get_bits(gb, 1) == 0) | |
1045 return 2; | |
1046 | |
1047 else if (get_bits(gb, 1) == 0) | |
1048 return 3; | |
1049 | |
1050 else if (get_bits(gb, 1) == 0) | |
1051 return 4; | |
1052 | |
1053 else if (get_bits(gb, 1) == 0) | |
1054 return 5; | |
1055 | |
1056 else if (get_bits(gb, 1) == 0) | |
1057 return 6; | |
1058 | |
1059 else | |
1060 return 7; | |
1061 | |
1062 } | |
1063 | |
1064 /* | |
1065 * This function extracts a motion vector from the bitstream using a VLC | |
1066 * scheme. 3 bits are fetched from the bitstream and 1 of 8 actions is | |
1067 * taken depending on the value on those 3 bits: | |
1068 * | |
1069 * 0: return 0 | |
1070 * 1: return 1 | |
1071 * 2: return -1 | |
1072 * 3: if (next bit is 1) return -2, else return 2 | |
1073 * 4: if (next bit is 1) return -3, else return 3 | |
1074 * 5: return 4 + (next 2 bits), next bit is sign | |
1075 * 6: return 8 + (next 3 bits), next bit is sign | |
1076 * 7: return 16 + (next 4 bits), next bit is sign | |
1077 */ | |
1078 static int get_motion_vector_vlc(GetBitContext *gb) | |
1079 { | |
1080 int bits; | |
1081 | |
1082 bits = get_bits(gb, 3); | |
1083 | |
1084 switch(bits) { | |
1085 | |
1086 case 0: | |
1087 bits = 0; | |
1088 break; | |
1089 | |
1090 case 1: | |
1091 bits = 1; | |
1092 break; | |
1093 | |
1094 case 2: | |
1095 bits = -1; | |
1096 break; | |
1097 | |
1098 case 3: | |
1099 if (get_bits(gb, 1) == 0) | |
1100 bits = 2; | |
1101 else | |
1102 bits = -2; | |
1103 break; | |
1104 | |
1105 case 4: | |
1106 if (get_bits(gb, 1) == 0) | |
1107 bits = 3; | |
1108 else | |
1109 bits = -3; | |
1110 break; | |
1111 | |
1112 case 5: | |
1113 bits = 4 + get_bits(gb, 2); | |
1114 if (get_bits(gb, 1) == 1) | |
1115 bits = -bits; | |
1116 break; | |
1117 | |
1118 case 6: | |
1119 bits = 8 + get_bits(gb, 3); | |
1120 if (get_bits(gb, 1) == 1) | |
1121 bits = -bits; | |
1122 break; | |
1123 | |
1124 case 7: | |
1125 bits = 16 + get_bits(gb, 4); | |
1126 if (get_bits(gb, 1) == 1) | |
1127 bits = -bits; | |
1128 break; | |
1129 | |
1130 } | |
1131 | |
1132 return bits; | |
1133 } | |
1134 | |
1135 /* | |
1136 * This function fetches a 5-bit number from the stream followed by | |
1137 * a sign and calls it a motion vector. | |
1138 */ | |
1139 static int get_motion_vector_fixed(GetBitContext *gb) | |
1140 { | |
1141 | |
1142 int bits; | |
1143 | |
1144 bits = get_bits(gb, 5); | |
1145 | |
1146 if (get_bits(gb, 1) == 1) | |
1147 bits = -bits; | |
1148 | |
1149 return bits; | |
1150 } | |
1151 | |
1152 /* | |
1153 * This function unpacks all of the superblock/macroblock/fragment coding | |
1154 * information from the bitstream. | |
1155 */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1156 static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb) |
1224 | 1157 { |
1158 int bit = 0; | |
1159 int current_superblock = 0; | |
1160 int current_run = 0; | |
1161 int decode_fully_flags = 0; | |
1162 int decode_partial_blocks = 0; | |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1163 int first_c_fragment_seen; |
1224 | 1164 |
1165 int i, j; | |
1166 int current_fragment; | |
1167 | |
1168 debug_vp3(" vp3: unpacking superblock coding\n"); | |
1169 | |
1170 if (s->keyframe) { | |
1171 | |
1172 debug_vp3(" keyframe-- all superblocks are fully coded\n"); | |
1173 memset(s->superblock_coding, SB_FULLY_CODED, s->superblock_count); | |
1174 | |
1175 } else { | |
1176 | |
1177 /* unpack the list of partially-coded superblocks */ | |
1178 bit = get_bits(gb, 1); | |
1179 /* toggle the bit because as soon as the first run length is | |
1180 * fetched the bit will be toggled again */ | |
1181 bit ^= 1; | |
1182 while (current_superblock < s->superblock_count) { | |
2705 | 1183 if (current_run-- == 0) { |
1224 | 1184 bit ^= 1; |
2703
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1185 #if 1 |
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1186 current_run = get_vlc2(gb, |
2705 | 1187 s->superblock_run_length_vlc.table, 6, 2); |
1188 if (current_run == 33) | |
2703
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1189 current_run += get_bits(gb, 12); |
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1190 #else |
1224 | 1191 current_run = get_superblock_run_length(gb); |
2703
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1192 #endif |
1224 | 1193 debug_block_coding(" setting superblocks %d..%d to %s\n", |
1194 current_superblock, | |
1195 current_superblock + current_run - 1, | |
1196 (bit) ? "partially coded" : "not coded"); | |
1197 | |
1198 /* if any of the superblocks are not partially coded, flag | |
1199 * a boolean to decode the list of fully-coded superblocks */ | |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1200 if (bit == 0) { |
1224 | 1201 decode_fully_flags = 1; |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1202 } else { |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1203 |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1204 /* make a note of the fact that there are partially coded |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1205 * superblocks */ |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1206 decode_partial_blocks = 1; |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1207 } |
1224 | 1208 } |
2705 | 1209 s->superblock_coding[current_superblock++] = bit; |
1224 | 1210 } |
1211 | |
1212 /* unpack the list of fully coded superblocks if any of the blocks were | |
1213 * not marked as partially coded in the previous step */ | |
1214 if (decode_fully_flags) { | |
1215 | |
1216 current_superblock = 0; | |
1217 current_run = 0; | |
1218 bit = get_bits(gb, 1); | |
1219 /* toggle the bit because as soon as the first run length is | |
1220 * fetched the bit will be toggled again */ | |
1221 bit ^= 1; | |
1222 while (current_superblock < s->superblock_count) { | |
1223 | |
1224 /* skip any superblocks already marked as partially coded */ | |
1225 if (s->superblock_coding[current_superblock] == SB_NOT_CODED) { | |
1226 | |
2705 | 1227 if (current_run-- == 0) { |
1224 | 1228 bit ^= 1; |
2703
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1229 #if 1 |
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1230 current_run = get_vlc2(gb, |
2705 | 1231 s->superblock_run_length_vlc.table, 6, 2); |
1232 if (current_run == 33) | |
2703
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1233 current_run += get_bits(gb, 12); |
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1234 #else |
1224 | 1235 current_run = get_superblock_run_length(gb); |
2703
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
1236 #endif |
1224 | 1237 } |
1238 | |
1239 debug_block_coding(" setting superblock %d to %s\n", | |
1240 current_superblock, | |
1241 (bit) ? "fully coded" : "not coded"); | |
2705 | 1242 s->superblock_coding[current_superblock] = 2*bit; |
1224 | 1243 } |
1244 current_superblock++; | |
1245 } | |
1246 } | |
1247 | |
1248 /* if there were partial blocks, initialize bitstream for | |
1249 * unpacking fragment codings */ | |
1250 if (decode_partial_blocks) { | |
1251 | |
1252 current_run = 0; | |
1253 bit = get_bits(gb, 1); | |
1254 /* toggle the bit because as soon as the first run length is | |
1255 * fetched the bit will be toggled again */ | |
1256 bit ^= 1; | |
1257 } | |
1258 } | |
1259 | |
1260 /* figure out which fragments are coded; iterate through each | |
1261 * superblock (all planes) */ | |
1262 s->coded_fragment_list_index = 0; | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1263 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
|
1264 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
|
1265 first_c_fragment_seen = 0; |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1266 memset(s->macroblock_coding, MODE_COPY, s->macroblock_count); |
1224 | 1267 for (i = 0; i < s->superblock_count; i++) { |
1268 | |
1269 /* iterate through all 16 fragments in a superblock */ | |
1270 for (j = 0; j < 16; j++) { | |
1271 | |
1272 /* if the fragment is in bounds, check its coding status */ | |
1273 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
|
1274 if (current_fragment >= s->fragment_count) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
1275 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_superblocks(): bad fragment number (%d >= %d)\n", |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1276 current_fragment, s->fragment_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1277 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1278 } |
1224 | 1279 if (current_fragment != -1) { |
1280 if (s->superblock_coding[i] == SB_NOT_CODED) { | |
1281 | |
1282 /* copy all the fragments from the prior frame */ | |
1283 s->all_fragments[current_fragment].coding_method = | |
1284 MODE_COPY; | |
1285 | |
1286 } else if (s->superblock_coding[i] == SB_PARTIALLY_CODED) { | |
1287 | |
1288 /* fragment may or may not be coded; this is the case | |
1289 * that cares about the fragment coding runs */ | |
2705 | 1290 if (current_run-- == 0) { |
1224 | 1291 bit ^= 1; |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1292 #if 1 |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1293 current_run = get_vlc2(gb, |
2705 | 1294 s->fragment_run_length_vlc.table, 5, 2); |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1295 #else |
1224 | 1296 current_run = get_fragment_run_length(gb); |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1297 #endif |
1224 | 1298 } |
1299 | |
1300 if (bit) { | |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1301 /* 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
|
1302 * the next phase */ |
1224 | 1303 s->all_fragments[current_fragment].coding_method = |
1304 MODE_INTER_NO_MV; | |
2689
ed0ab6f82167
clear blocks after each idct instead of per picture
michael
parents:
2687
diff
changeset
|
1305 s->all_fragments[current_fragment].coeffs= s->coeffs + 64*s->coded_fragment_list_index; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1306 s->coded_fragment_list[s->coded_fragment_list_index] = |
1224 | 1307 current_fragment; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1308 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
|
1309 (s->last_coded_y_fragment == -1) && |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1310 (!first_c_fragment_seen)) { |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1311 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
|
1312 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
|
1313 first_c_fragment_seen = 1; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1314 } |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1315 s->coded_fragment_list_index++; |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1316 s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV; |
1224 | 1317 debug_block_coding(" superblock %d is partially coded, fragment %d is coded\n", |
1318 i, current_fragment); | |
1319 } else { | |
1320 /* not coded; copy this fragment from the prior frame */ | |
1321 s->all_fragments[current_fragment].coding_method = | |
1322 MODE_COPY; | |
1323 debug_block_coding(" superblock %d is partially coded, fragment %d is not coded\n", | |
1324 i, current_fragment); | |
1325 } | |
1326 | |
1327 } else { | |
1328 | |
1329 /* fragments are fully coded in this superblock; actual | |
1330 * coding will be determined in next step */ | |
1331 s->all_fragments[current_fragment].coding_method = | |
1332 MODE_INTER_NO_MV; | |
2689
ed0ab6f82167
clear blocks after each idct instead of per picture
michael
parents:
2687
diff
changeset
|
1333 s->all_fragments[current_fragment].coeffs= s->coeffs + 64*s->coded_fragment_list_index; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1334 s->coded_fragment_list[s->coded_fragment_list_index] = |
1224 | 1335 current_fragment; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1336 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
|
1337 (s->last_coded_y_fragment == -1) && |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1338 (!first_c_fragment_seen)) { |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1339 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
|
1340 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
|
1341 first_c_fragment_seen = 1; |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1342 } |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1343 s->coded_fragment_list_index++; |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1344 s->macroblock_coding[s->all_fragments[current_fragment].macroblock] = MODE_INTER_NO_MV; |
1224 | 1345 debug_block_coding(" superblock %d is fully coded, fragment %d is coded\n", |
1346 i, current_fragment); | |
1347 } | |
1348 } | |
1349 } | |
1350 } | |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1351 |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1352 if (!first_c_fragment_seen) |
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1353 /* 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
|
1354 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
|
1355 else |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1356 /* end the list of coded C fragments */ |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1357 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
|
1358 |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1359 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
|
1360 s->coded_fragment_list_index, |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1361 s->first_coded_y_fragment, |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1362 s->last_coded_y_fragment, |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1363 s->first_coded_c_fragment, |
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1364 s->last_coded_c_fragment); |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1365 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1366 return 0; |
1224 | 1367 } |
1368 | |
1369 /* | |
1370 * This function unpacks all the coding mode data for individual macroblocks | |
1371 * from the bitstream. | |
1372 */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1373 static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb) |
1224 | 1374 { |
1375 int i, j, k; | |
1376 int scheme; | |
1377 int current_macroblock; | |
1378 int current_fragment; | |
1379 int coding_mode; | |
1380 | |
1381 debug_vp3(" vp3: unpacking encoding modes\n"); | |
1382 | |
1383 if (s->keyframe) { | |
1384 debug_vp3(" keyframe-- all blocks are coded as INTRA\n"); | |
1385 | |
1386 for (i = 0; i < s->fragment_count; i++) | |
1387 s->all_fragments[i].coding_method = MODE_INTRA; | |
1388 | |
1389 } else { | |
1390 | |
1391 /* fetch the mode coding scheme for this frame */ | |
1392 scheme = get_bits(gb, 3); | |
1393 debug_modes(" using mode alphabet %d\n", scheme); | |
1394 | |
1395 /* is it a custom coding scheme? */ | |
1396 if (scheme == 0) { | |
1397 debug_modes(" custom mode alphabet ahead:\n"); | |
1398 for (i = 0; i < 8; i++) | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1399 ModeAlphabet[scheme][get_bits(gb, 3)] = i; |
1224 | 1400 } |
1401 | |
1402 for (i = 0; i < 8; i++) | |
1403 debug_modes(" mode[%d][%d] = %d\n", scheme, i, | |
1404 ModeAlphabet[scheme][i]); | |
1405 | |
1406 /* iterate through all of the macroblocks that contain 1 or more | |
1407 * coded fragments */ | |
1408 for (i = 0; i < s->u_superblock_start; i++) { | |
1409 | |
1410 for (j = 0; j < 4; j++) { | |
1411 current_macroblock = s->superblock_macroblocks[i * 4 + j]; | |
1412 if ((current_macroblock == -1) || | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1413 (s->macroblock_coding[current_macroblock] == MODE_COPY)) |
1224 | 1414 continue; |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1415 if (current_macroblock >= s->macroblock_count) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
1416 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_modes(): bad macroblock number (%d >= %d)\n", |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1417 current_macroblock, s->macroblock_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1418 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1419 } |
1224 | 1420 |
1421 /* mode 7 means get 3 bits for each coding mode */ | |
1422 if (scheme == 7) | |
1423 coding_mode = get_bits(gb, 3); | |
1424 else | |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1425 { |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1426 #if 1 |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1427 coding_mode = ModeAlphabet[scheme] |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1428 [get_vlc2(gb, s->mode_code_vlc.table, 3, 3)]; |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1429 #else |
1224 | 1430 coding_mode = ModeAlphabet[scheme][get_mode_code(gb)]; |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1431 #endif |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1432 } |
1224 | 1433 |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
1434 s->macroblock_coding[current_macroblock] = coding_mode; |
1224 | 1435 for (k = 0; k < 6; k++) { |
1436 current_fragment = | |
1437 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
|
1438 if (current_fragment == -1) |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1439 continue; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1440 if (current_fragment >= s->fragment_count) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
1441 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_modes(): bad fragment number (%d >= %d)\n", |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1442 current_fragment, s->fragment_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1443 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1444 } |
1224 | 1445 if (s->all_fragments[current_fragment].coding_method != |
1446 MODE_COPY) | |
1447 s->all_fragments[current_fragment].coding_method = | |
1448 coding_mode; | |
1449 } | |
1450 | |
1451 debug_modes(" coding method for macroblock starting @ fragment %d = %d\n", | |
1452 s->macroblock_fragments[current_macroblock * 6], coding_mode); | |
1453 } | |
1454 } | |
1455 } | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1456 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1457 return 0; |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1458 } |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1459 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1460 /* |
1224 | 1461 * This function unpacks all the motion vectors for the individual |
1462 * macroblocks from the bitstream. | |
1463 */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1464 static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb) |
1224 | 1465 { |
1466 int i, j, k; | |
1467 int coding_mode; | |
1468 int motion_x[6]; | |
1469 int motion_y[6]; | |
1470 int last_motion_x = 0; | |
1471 int last_motion_y = 0; | |
1472 int prior_last_motion_x = 0; | |
1473 int prior_last_motion_y = 0; | |
1474 int current_macroblock; | |
1475 int current_fragment; | |
1476 | |
1477 debug_vp3(" vp3: unpacking motion vectors\n"); | |
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) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
1502 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vectors(): bad macroblock number (%d >= %d)\n", |
1238
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) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
1509 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vectors(): bad fragment number (%d >= %d\n", |
1238
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) { | |
2709 | 1519 #if 1 |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1520 motion_x[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1521 motion_y[0] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1522 #else |
1224 | 1523 motion_x[0] = get_motion_vector_vlc(gb); |
1524 motion_y[0] = get_motion_vector_vlc(gb); | |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1525 #endif |
1224 | 1526 } else { |
1527 motion_x[0] = get_motion_vector_fixed(gb); | |
1528 motion_y[0] = get_motion_vector_fixed(gb); | |
1529 } | |
1530 for (k = 1; k < 6; k++) { | |
1531 motion_x[k] = motion_x[0]; | |
1532 motion_y[k] = motion_y[0]; | |
1533 } | |
1534 | |
1535 /* vector maintenance, only on MODE_INTER_PLUS_MV */ | |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1536 if (s->macroblock_coding[current_macroblock] == |
1224 | 1537 MODE_INTER_PLUS_MV) { |
1538 prior_last_motion_x = last_motion_x; | |
1539 prior_last_motion_y = last_motion_y; | |
1540 last_motion_x = motion_x[0]; | |
1541 last_motion_y = motion_y[0]; | |
1542 } | |
1543 break; | |
1544 | |
1545 case MODE_INTER_FOURMV: | |
1546 /* fetch 4 vectors from the bitstream, one for each | |
1547 * Y fragment, then average for the C fragment vectors */ | |
1548 motion_x[4] = motion_y[4] = 0; | |
1549 for (k = 0; k < 4; k++) { | |
1550 if (coding_mode == 0) { | |
2709 | 1551 #if 1 |
1552 motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; | |
1553 motion_y[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; | |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1554 #else |
1224 | 1555 motion_x[k] = get_motion_vector_vlc(gb); |
1556 motion_y[k] = get_motion_vector_vlc(gb); | |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
1557 #endif |
1224 | 1558 } else { |
1559 motion_x[k] = get_motion_vector_fixed(gb); | |
1560 motion_y[k] = get_motion_vector_fixed(gb); | |
1561 } | |
1562 motion_x[4] += motion_x[k]; | |
1563 motion_y[4] += motion_y[k]; | |
1564 } | |
1565 | |
1566 if (motion_x[4] >= 0) | |
1567 motion_x[4] = (motion_x[4] + 2) / 4; | |
1568 else | |
1569 motion_x[4] = (motion_x[4] - 2) / 4; | |
1570 motion_x[5] = motion_x[4]; | |
1571 | |
1572 if (motion_y[4] >= 0) | |
1573 motion_y[4] = (motion_y[4] + 2) / 4; | |
1574 else | |
1575 motion_y[4] = (motion_y[4] - 2) / 4; | |
1576 motion_y[5] = motion_y[4]; | |
1577 | |
1578 /* vector maintenance; vector[3] is treated as the | |
1579 * last vector in this case */ | |
1580 prior_last_motion_x = last_motion_x; | |
1581 prior_last_motion_y = last_motion_y; | |
1582 last_motion_x = motion_x[3]; | |
1583 last_motion_y = motion_y[3]; | |
1584 break; | |
1585 | |
1586 case MODE_INTER_LAST_MV: | |
1587 /* all 6 fragments use the last motion vector */ | |
1588 motion_x[0] = last_motion_x; | |
1589 motion_y[0] = last_motion_y; | |
1590 for (k = 1; k < 6; k++) { | |
1591 motion_x[k] = motion_x[0]; | |
1592 motion_y[k] = motion_y[0]; | |
1593 } | |
1594 | |
1595 /* no vector maintenance (last vector remains the | |
1596 * last vector) */ | |
1597 break; | |
1598 | |
1599 case MODE_INTER_PRIOR_LAST: | |
1600 /* all 6 fragments use the motion vector prior to the | |
1601 * last motion vector */ | |
1602 motion_x[0] = prior_last_motion_x; | |
1603 motion_y[0] = prior_last_motion_y; | |
1604 for (k = 1; k < 6; k++) { | |
1605 motion_x[k] = motion_x[0]; | |
1606 motion_y[k] = motion_y[0]; | |
1607 } | |
1608 | |
1609 /* vector maintenance */ | |
1610 prior_last_motion_x = last_motion_x; | |
1611 prior_last_motion_y = last_motion_y; | |
1612 last_motion_x = motion_x[0]; | |
1613 last_motion_y = motion_y[0]; | |
1614 break; | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1615 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1616 default: |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1617 /* 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
|
1618 memset(motion_x, 0, 6 * sizeof(int)); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1619 memset(motion_y, 0, 6 * sizeof(int)); |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1620 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1621 /* no vector maintenance */ |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
1622 break; |
1224 | 1623 } |
1624 | |
1625 /* assign the motion vectors to the correct fragments */ | |
1626 debug_vectors(" vectors for macroblock starting @ fragment %d (coding method %d):\n", | |
1627 current_fragment, | |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1628 s->macroblock_coding[current_macroblock]); |
1224 | 1629 for (k = 0; k < 6; k++) { |
1630 current_fragment = | |
1631 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
|
1632 if (current_fragment == -1) |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1633 continue; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1634 if (current_fragment >= s->fragment_count) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
1635 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vectors(): bad fragment number (%d >= %d)\n", |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1636 current_fragment, s->fragment_count); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1637 return 1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1638 } |
1224 | 1639 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
|
1640 s->all_fragments[current_fragment].motion_y = motion_y[k]; |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1641 debug_vectors(" vector %d: fragment %d = (%d, %d)\n", |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
1642 k, current_fragment, motion_x[k], motion_y[k]); |
1224 | 1643 } |
1644 } | |
1645 } | |
1646 } | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1647 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1648 return 0; |
1224 | 1649 } |
1650 | |
1651 /* | |
1652 * This function is called by unpack_dct_coeffs() to extract the VLCs from | |
1653 * the bitstream. The VLCs encode tokens which are used to unpack DCT | |
1654 * data. This function unpacks all the VLCs for either the Y plane or both | |
1655 * C planes, and is called for DC coefficients or different AC coefficient | |
1656 * levels (since different coefficient types require different VLC tables. | |
1657 * | |
1658 * This function returns a residual eob run. E.g, if a particular token gave | |
1659 * instructions to EOB the next 5 fragments and there were only 2 fragments | |
1660 * left in the current fragment range, 3 would be returned so that it could | |
1661 * be passed into the next call to this same function. | |
1662 */ | |
1663 static int unpack_vlcs(Vp3DecodeContext *s, GetBitContext *gb, | |
1664 VLC *table, int coeff_index, | |
1665 int first_fragment, int last_fragment, | |
1666 int eob_run) | |
1667 { | |
1668 int i; | |
1669 int token; | |
1670 int zero_run; | |
1671 DCTELEM coeff; | |
1672 Vp3Fragment *fragment; | |
2694 | 1673 uint8_t *perm= s->scantable.permutated; |
1224 | 1674 |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1675 if ((first_fragment >= s->fragment_count) || |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1676 (last_fragment >= s->fragment_count)) { |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1677 |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
1678 av_log(s->avctx, AV_LOG_ERROR, " vp3:unpack_vlcs(): bad fragment number (%d -> %d ?)\n", |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1679 first_fragment, last_fragment); |
1272
777d4145cdfb
fix subtle logic problem in block unpacker that leads to incorrect token
tmmm
parents:
1244
diff
changeset
|
1680 return 0; |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1681 } |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
1682 |
1236
d6e4784ffc16
dump the shady binary search logic (the part that binary searches
tmmm
parents:
1233
diff
changeset
|
1683 for (i = first_fragment; i <= last_fragment; i++) { |
1224 | 1684 |
1685 fragment = &s->all_fragments[s->coded_fragment_list[i]]; | |
1686 if (fragment->coeff_count > coeff_index) | |
1687 continue; | |
1688 | |
1689 if (!eob_run) { | |
1690 /* decode a VLC into a token */ | |
1691 token = get_vlc2(gb, table->table, 5, 3); | |
1692 debug_vlc(" token = %2d, ", token); | |
1693 /* use the token to get a zero run, a coefficient, and an eob run */ | |
1694 unpack_token(gb, token, &zero_run, &coeff, &eob_run); | |
1695 } | |
1696 | |
1697 if (!eob_run) { | |
1698 fragment->coeff_count += zero_run; | |
1699 if (fragment->coeff_count < 64) | |
2694 | 1700 fragment->coeffs[perm[fragment->coeff_count++]] = coeff; |
1224 | 1701 debug_vlc(" fragment %d coeff = %d\n", |
1702 s->coded_fragment_list[i], fragment->coeffs[coeff_index]); | |
1703 } else { | |
1704 fragment->last_coeff = fragment->coeff_count; | |
1705 fragment->coeff_count = 64; | |
1706 debug_vlc(" fragment %d eob with %d coefficients\n", | |
1707 s->coded_fragment_list[i], fragment->last_coeff); | |
1708 eob_run--; | |
1709 } | |
1710 } | |
1711 | |
1712 return eob_run; | |
1713 } | |
1714 | |
1715 /* | |
1716 * This function unpacks all of the DCT coefficient data from the | |
1717 * bitstream. | |
1718 */ | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1719 static int unpack_dct_coeffs(Vp3DecodeContext *s, GetBitContext *gb) |
1224 | 1720 { |
1721 int i; | |
1722 int dc_y_table; | |
1723 int dc_c_table; | |
1724 int ac_y_table; | |
1725 int ac_c_table; | |
1726 int residual_eob_run = 0; | |
1727 | |
1728 /* fetch the DC table indices */ | |
1729 dc_y_table = get_bits(gb, 4); | |
1730 dc_c_table = get_bits(gb, 4); | |
1731 | |
1732 /* unpack the Y plane DC coefficients */ | |
1733 debug_vp3(" vp3: unpacking Y plane DC coefficients using table %d\n", | |
1734 dc_y_table); | |
1735 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
|
1736 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1737 |
1738 /* unpack the C plane DC coefficients */ | |
1739 debug_vp3(" vp3: unpacking C plane DC coefficients using table %d\n", | |
1740 dc_c_table); | |
1741 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
|
1742 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1743 |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1744 /* fetch the AC table indices */ |
1224 | 1745 ac_y_table = get_bits(gb, 4); |
1746 ac_c_table = get_bits(gb, 4); | |
1747 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1748 /* unpack the group 1 AC coefficients (coeffs 1-5) */ |
1224 | 1749 for (i = 1; i <= 5; i++) { |
1750 | |
1751 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n", | |
1752 i, ac_y_table); | |
1753 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
|
1754 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1755 |
1756 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n", | |
1757 i, ac_c_table); | |
1758 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
|
1759 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1760 } |
1761 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1762 /* unpack the group 2 AC coefficients (coeffs 6-14) */ |
1224 | 1763 for (i = 6; i <= 14; i++) { |
1764 | |
1765 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n", | |
1766 i, ac_y_table); | |
1767 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
|
1768 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1769 |
1770 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n", | |
1771 i, ac_c_table); | |
1772 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
|
1773 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1774 } |
1775 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1776 /* unpack the group 3 AC coefficients (coeffs 15-27) */ |
1224 | 1777 for (i = 15; i <= 27; i++) { |
1778 | |
1779 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n", | |
1780 i, ac_y_table); | |
1781 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
|
1782 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1783 |
1784 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n", | |
1785 i, ac_c_table); | |
1786 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
|
1787 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1788 } |
1789 | |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
1790 /* unpack the group 4 AC coefficients (coeffs 28-63) */ |
1224 | 1791 for (i = 28; i <= 63; i++) { |
1792 | |
1793 debug_vp3(" vp3: unpacking level %d Y plane AC coefficients using table %d\n", | |
1794 i, ac_y_table); | |
1795 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
|
1796 s->first_coded_y_fragment, s->last_coded_y_fragment, residual_eob_run); |
1224 | 1797 |
1798 debug_vp3(" vp3: unpacking level %d C plane AC coefficients using table %d\n", | |
1799 i, ac_c_table); | |
1800 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
|
1801 s->first_coded_c_fragment, s->last_coded_c_fragment, residual_eob_run); |
1224 | 1802 } |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1803 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
1804 return 0; |
1224 | 1805 } |
1806 | |
1807 /* | |
1808 * This function reverses the DC prediction for each coded fragment in | |
1809 * the frame. Much of this function is adapted directly from the original | |
1810 * VP3 source code. | |
1811 */ | |
1812 #define COMPATIBLE_FRAME(x) \ | |
1813 (compatible_frame[s->all_fragments[x].coding_method] == current_frame_type) | |
1814 #define FRAME_CODED(x) (s->all_fragments[x].coding_method != MODE_COPY) | |
1815 static inline int iabs (int x) { return ((x < 0) ? -x : x); } | |
1816 | |
1817 static void reverse_dc_prediction(Vp3DecodeContext *s, | |
1818 int first_fragment, | |
1819 int fragment_width, | |
1820 int fragment_height) | |
1821 { | |
1822 | |
1823 #define PUL 8 | |
1824 #define PU 4 | |
1825 #define PUR 2 | |
1826 #define PL 1 | |
1827 | |
1828 int x, y; | |
1829 int i = first_fragment; | |
1830 | |
1831 /* | |
1832 * Fragment prediction groups: | |
1833 * | |
1834 * 32222222226 | |
1835 * 10000000004 | |
1836 * 10000000004 | |
1837 * 10000000004 | |
1838 * 10000000004 | |
1839 * | |
1840 * Note: Groups 5 and 7 do not exist as it would mean that the | |
1841 * fragment's x coordinate is both 0 and (width - 1) at the same time. | |
1842 */ | |
1843 int predictor_group; | |
1844 short predicted_dc; | |
1845 | |
1846 /* validity flags for the left, up-left, up, and up-right fragments */ | |
1847 int fl, ful, fu, fur; | |
1848 | |
1849 /* DC values for the left, up-left, up, and up-right fragments */ | |
1850 int vl, vul, vu, vur; | |
1851 | |
1852 /* indices for the left, up-left, up, and up-right fragments */ | |
1853 int l, ul, u, ur; | |
1854 | |
1855 /* | |
1856 * The 6 fields mean: | |
1857 * 0: up-left multiplier | |
1858 * 1: up multiplier | |
1859 * 2: up-right multiplier | |
1860 * 3: left multiplier | |
1861 * 4: mask | |
1862 * 5: right bit shift divisor (e.g., 7 means >>=7, a.k.a. div by 128) | |
1863 */ | |
1864 int predictor_transform[16][6] = { | |
1865 { 0, 0, 0, 0, 0, 0 }, | |
1866 { 0, 0, 0, 1, 0, 0 }, // PL | |
1867 { 0, 0, 1, 0, 0, 0 }, // PUR | |
1868 { 0, 0, 53, 75, 127, 7 }, // PUR|PL | |
1869 { 0, 1, 0, 0, 0, 0 }, // PU | |
1870 { 0, 1, 0, 1, 1, 1 }, // PU|PL | |
1871 { 0, 1, 0, 0, 0, 0 }, // PU|PUR | |
1872 { 0, 0, 53, 75, 127, 7 }, // PU|PUR|PL | |
1873 { 1, 0, 0, 0, 0, 0 }, // PUL | |
1874 { 0, 0, 0, 1, 0, 0 }, // PUL|PL | |
1875 { 1, 0, 1, 0, 1, 1 }, // PUL|PUR | |
1876 { 0, 0, 53, 75, 127, 7 }, // PUL|PUR|PL | |
1877 { 0, 1, 0, 0, 0, 0 }, // PUL|PU | |
1878 {-26, 29, 0, 29, 31, 5 }, // PUL|PU|PL | |
1879 { 3, 10, 3, 0, 15, 4 }, // PUL|PU|PUR | |
1880 {-26, 29, 0, 29, 31, 5 } // PUL|PU|PUR|PL | |
1881 }; | |
1882 | |
1883 /* This table shows which types of blocks can use other blocks for | |
1884 * prediction. For example, INTRA is the only mode in this table to | |
1885 * have a frame number of 0. That means INTRA blocks can only predict | |
1886 * from other INTRA blocks. There are 2 golden frame coding types; | |
1887 * blocks encoding in these modes can only predict from other blocks | |
1888 * that were encoded with these 1 of these 2 modes. */ | |
1889 unsigned char compatible_frame[8] = { | |
1890 1, /* MODE_INTER_NO_MV */ | |
1891 0, /* MODE_INTRA */ | |
1892 1, /* MODE_INTER_PLUS_MV */ | |
1893 1, /* MODE_INTER_LAST_MV */ | |
1894 1, /* MODE_INTER_PRIOR_MV */ | |
1895 2, /* MODE_USING_GOLDEN */ | |
1896 2, /* MODE_GOLDEN_MV */ | |
1897 1 /* MODE_INTER_FOUR_MV */ | |
1898 }; | |
1899 int current_frame_type; | |
1900 | |
1901 /* there is a last DC predictor for each of the 3 frame types */ | |
1902 short last_dc[3]; | |
1903 | |
1904 int transform = 0; | |
1905 | |
1906 debug_vp3(" vp3: reversing DC prediction\n"); | |
1907 | |
1908 vul = vu = vur = vl = 0; | |
1909 last_dc[0] = last_dc[1] = last_dc[2] = 0; | |
1910 | |
1911 /* for each fragment row... */ | |
1912 for (y = 0; y < fragment_height; y++) { | |
1913 | |
1914 /* for each fragment in a row... */ | |
1915 for (x = 0; x < fragment_width; x++, i++) { | |
1916 | |
1917 /* reverse prediction if this block was coded */ | |
1918 if (s->all_fragments[i].coding_method != MODE_COPY) { | |
1919 | |
1920 current_frame_type = | |
1921 compatible_frame[s->all_fragments[i].coding_method]; | |
1922 predictor_group = (x == 0) + ((y == 0) << 1) + | |
1923 ((x + 1 == fragment_width) << 2); | |
1924 debug_dc_pred(" frag %d: group %d, orig DC = %d, ", | |
1925 i, predictor_group, s->all_fragments[i].coeffs[0]); | |
1926 | |
1927 switch (predictor_group) { | |
1928 | |
1929 case 0: | |
1930 /* main body of fragments; consider all 4 possible | |
1931 * fragments for prediction */ | |
1932 | |
1933 /* calculate the indices of the predicting fragments */ | |
1934 ul = i - fragment_width - 1; | |
1935 u = i - fragment_width; | |
1936 ur = i - fragment_width + 1; | |
1937 l = i - 1; | |
1938 | |
1939 /* fetch the DC values for the predicting fragments */ | |
1940 vul = s->all_fragments[ul].coeffs[0]; | |
1941 vu = s->all_fragments[u].coeffs[0]; | |
1942 vur = s->all_fragments[ur].coeffs[0]; | |
1943 vl = s->all_fragments[l].coeffs[0]; | |
1944 | |
1945 /* figure out which fragments are valid */ | |
1946 ful = FRAME_CODED(ul) && COMPATIBLE_FRAME(ul); | |
1947 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u); | |
1948 fur = FRAME_CODED(ur) && COMPATIBLE_FRAME(ur); | |
1949 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l); | |
1950 | |
1951 /* decide which predictor transform to use */ | |
1952 transform = (fl*PL) | (fu*PU) | (ful*PUL) | (fur*PUR); | |
1953 | |
1954 break; | |
1955 | |
1956 case 1: | |
1957 /* left column of fragments, not including top corner; | |
1958 * only consider up and up-right fragments */ | |
1959 | |
1960 /* calculate the indices of the predicting fragments */ | |
1961 u = i - fragment_width; | |
1962 ur = i - fragment_width + 1; | |
1963 | |
1964 /* fetch the DC values for the predicting fragments */ | |
1965 vu = s->all_fragments[u].coeffs[0]; | |
1966 vur = s->all_fragments[ur].coeffs[0]; | |
1967 | |
1968 /* figure out which fragments are valid */ | |
1969 fur = FRAME_CODED(ur) && COMPATIBLE_FRAME(ur); | |
1970 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u); | |
1971 | |
1972 /* decide which predictor transform to use */ | |
1973 transform = (fu*PU) | (fur*PUR); | |
1974 | |
1975 break; | |
1976 | |
1977 case 2: | |
1978 case 6: | |
1979 /* top row of fragments, not including top-left frag; | |
1980 * only consider the left fragment for prediction */ | |
1981 | |
1982 /* calculate the indices of the predicting fragments */ | |
1983 l = i - 1; | |
1984 | |
1985 /* fetch the DC values for the predicting fragments */ | |
1986 vl = s->all_fragments[l].coeffs[0]; | |
1987 | |
1988 /* figure out which fragments are valid */ | |
1989 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l); | |
1990 | |
1991 /* decide which predictor transform to use */ | |
1992 transform = (fl*PL); | |
1993 | |
1994 break; | |
1995 | |
1996 case 3: | |
1997 /* top-left fragment */ | |
1998 | |
1999 /* nothing to predict from in this case */ | |
2000 transform = 0; | |
2001 | |
2002 break; | |
2003 | |
2004 case 4: | |
2005 /* right column of fragments, not including top corner; | |
2006 * consider up-left, up, and left fragments for | |
2007 * prediction */ | |
2008 | |
2009 /* calculate the indices of the predicting fragments */ | |
2010 ul = i - fragment_width - 1; | |
2011 u = i - fragment_width; | |
2012 l = i - 1; | |
2013 | |
2014 /* fetch the DC values for the predicting fragments */ | |
2015 vul = s->all_fragments[ul].coeffs[0]; | |
2016 vu = s->all_fragments[u].coeffs[0]; | |
2017 vl = s->all_fragments[l].coeffs[0]; | |
2018 | |
2019 /* figure out which fragments are valid */ | |
2020 ful = FRAME_CODED(ul) && COMPATIBLE_FRAME(ul); | |
2021 fu = FRAME_CODED(u) && COMPATIBLE_FRAME(u); | |
2022 fl = FRAME_CODED(l) && COMPATIBLE_FRAME(l); | |
2023 | |
2024 /* decide which predictor transform to use */ | |
2025 transform = (fl*PL) | (fu*PU) | (ful*PUL); | |
2026 | |
2027 break; | |
2028 | |
2029 } | |
2030 | |
2031 debug_dc_pred("transform = %d, ", transform); | |
2032 | |
2033 if (transform == 0) { | |
2034 | |
2035 /* if there were no fragments to predict from, use last | |
2036 * DC saved */ | |
2037 s->all_fragments[i].coeffs[0] += last_dc[current_frame_type]; | |
2038 debug_dc_pred("from last DC (%d) = %d\n", | |
2039 current_frame_type, s->all_fragments[i].coeffs[0]); | |
2040 | |
2041 } else { | |
2042 | |
2043 /* apply the appropriate predictor transform */ | |
2044 predicted_dc = | |
2045 (predictor_transform[transform][0] * vul) + | |
2046 (predictor_transform[transform][1] * vu) + | |
2047 (predictor_transform[transform][2] * vur) + | |
2048 (predictor_transform[transform][3] * vl); | |
2049 | |
2050 /* if there is a shift value in the transform, add | |
2051 * the sign bit before the shift */ | |
2052 if (predictor_transform[transform][5] != 0) { | |
2053 predicted_dc += ((predicted_dc >> 15) & | |
2054 predictor_transform[transform][4]); | |
2055 predicted_dc >>= predictor_transform[transform][5]; | |
2056 } | |
2057 | |
2058 /* check for outranging on the [ul u l] and | |
2059 * [ul u ur l] predictors */ | |
2060 if ((transform == 13) || (transform == 15)) { | |
2061 if (iabs(predicted_dc - vu) > 128) | |
2062 predicted_dc = vu; | |
2063 else if (iabs(predicted_dc - vl) > 128) | |
2064 predicted_dc = vl; | |
2065 else if (iabs(predicted_dc - vul) > 128) | |
2066 predicted_dc = vul; | |
2067 } | |
2068 | |
2069 /* at long last, apply the predictor */ | |
2070 s->all_fragments[i].coeffs[0] += predicted_dc; | |
2071 debug_dc_pred("from pred DC = %d\n", | |
2072 s->all_fragments[i].coeffs[0]); | |
2073 } | |
2074 | |
2075 /* save the DC */ | |
2076 last_dc[current_frame_type] = s->all_fragments[i].coeffs[0]; | |
2690 | 2077 if(s->all_fragments[i].coeffs[0] && s->all_fragments[i].last_coeff<0) |
2078 s->all_fragments[i].last_coeff= 0; | |
1224 | 2079 } |
2080 } | |
2081 } | |
2082 } | |
2083 | |
2084 /* | |
2085 * This function performs the final rendering of each fragment's data | |
2086 * onto the output frame. | |
2087 */ | |
2088 static void render_fragments(Vp3DecodeContext *s, | |
2089 int first_fragment, | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2090 int width, |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2091 int height, |
1224 | 2092 int plane /* 0 = Y, 1 = U, 2 = V */) |
2093 { | |
2693 | 2094 int x, y, j; |
1224 | 2095 int m, n; |
2096 int i = first_fragment; | |
2097 int16_t *dequantizer; | |
1977 | 2098 DCTELEM __align16 output_samples[64]; |
1224 | 2099 unsigned char *output_plane; |
2100 unsigned char *last_plane; | |
2101 unsigned char *golden_plane; | |
2102 int stride; | |
2031
4225c131a2eb
warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents:
2028
diff
changeset
|
2103 int motion_x = 0xdeadbeef, motion_y = 0xdeadbeef; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2104 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
|
2105 int motion_halfpel_index; |
1406 | 2106 uint8_t *motion_source; |
1224 | 2107 |
2108 debug_vp3(" vp3: rendering final fragments for %s\n", | |
2109 (plane == 0) ? "Y plane" : (plane == 1) ? "U plane" : "V plane"); | |
2110 | |
2111 /* set up plane-specific parameters */ | |
2112 if (plane == 0) { | |
2113 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
|
2114 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
|
2115 golden_plane = s->golden_frame.data[0]; |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2116 stride = s->current_frame.linesize[0]; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2117 if (!s->flipped_image) stride = -stride; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2118 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
|
2119 lower_motion_limit = height * s->current_frame.linesize[0] + width - 8; |
1224 | 2120 } else if (plane == 1) { |
2121 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
|
2122 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
|
2123 golden_plane = s->golden_frame.data[1]; |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2124 stride = s->current_frame.linesize[1]; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2125 if (!s->flipped_image) stride = -stride; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2126 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
|
2127 lower_motion_limit = height * s->current_frame.linesize[1] + width - 8; |
1224 | 2128 } else { |
2129 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
|
2130 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
|
2131 golden_plane = s->golden_frame.data[2]; |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2132 stride = s->current_frame.linesize[2]; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2133 if (!s->flipped_image) stride = -stride; |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2134 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
|
2135 lower_motion_limit = height * s->current_frame.linesize[2] + width - 8; |
1224 | 2136 } |
2422 | 2137 |
2466 | 2138 if(ABS(stride) > 2048) |
2422 | 2139 return; //various tables are fixed size |
1224 | 2140 |
2141 /* for each fragment row... */ | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2142 for (y = 0; y < height; y += 8) { |
1224 | 2143 |
2144 /* for each fragment in a row... */ | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2145 for (x = 0; x < width; x += 8, i++) { |
1224 | 2146 |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2147 if ((i < 0) || (i >= s->fragment_count)) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
2148 av_log(s->avctx, AV_LOG_ERROR, " vp3:render_fragments(): bad fragment number (%d)\n", i); |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2149 return; |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2150 } |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2151 |
1224 | 2152 /* transform if this block was coded */ |
1667 | 2153 if ((s->all_fragments[i].coding_method != MODE_COPY) && |
2154 !((s->avctx->flags & CODEC_FLAG_GRAY) && plane)) { | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2155 |
1406 | 2156 if ((s->all_fragments[i].coding_method == MODE_USING_GOLDEN) || |
2157 (s->all_fragments[i].coding_method == MODE_GOLDEN_MV)) | |
2158 motion_source= golden_plane; | |
2159 else | |
2160 motion_source= last_plane; | |
2161 | |
2162 motion_source += s->all_fragments[i].first_pixel; | |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2163 motion_halfpel_index = 0; |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2164 |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2165 /* sort out the motion vector if this fragment is coded |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2166 * using a motion vector method */ |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2167 if ((s->all_fragments[i].coding_method > MODE_INTRA) && |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2168 (s->all_fragments[i].coding_method != MODE_USING_GOLDEN)) { |
1406 | 2169 int src_x, src_y; |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2170 motion_x = s->all_fragments[i].motion_x; |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2171 motion_y = s->all_fragments[i].motion_y; |
1407 | 2172 if(plane){ |
2173 motion_x= (motion_x>>1) | (motion_x&1); | |
2174 motion_y= (motion_y>>1) | (motion_y&1); | |
2175 } | |
2176 | |
1406 | 2177 src_x= (motion_x>>1) + x; |
2178 src_y= (motion_y>>1) + y; | |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2179 if ((motion_x == 0xbeef) || (motion_y == 0xbeef)) |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
2180 av_log(s->avctx, AV_LOG_ERROR, " help! got beefy vector! (%X, %X)\n", motion_x, motion_y); |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2181 |
1407 | 2182 motion_halfpel_index = motion_x & 0x01; |
2183 motion_source += (motion_x >> 1); | |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2184 |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2185 // motion_y = -motion_y; |
1407 | 2186 motion_halfpel_index |= (motion_y & 0x01) << 1; |
2187 motion_source += ((motion_y >> 1) * stride); | |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2188 |
1406 | 2189 if(src_x<0 || src_y<0 || src_x + 9 >= width || src_y + 9 >= height){ |
2190 uint8_t *temp= s->edge_emu_buffer; | |
2191 if(stride<0) temp -= 9*stride; | |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2192 else temp += 9*stride; |
1406 | 2193 |
2194 ff_emulated_edge_mc(temp, motion_source, stride, 9, 9, src_x, src_y, width, height); | |
2195 motion_source= temp; | |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2196 } |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2197 } |
1864 | 2198 |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2199 |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2200 /* 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
|
2201 * previous or the golden frame */ |
1406 | 2202 if (s->all_fragments[i].coding_method != MODE_INTRA) { |
1864 | 2203 //Note, it is possible to implement all MC cases with put_no_rnd_pixels_l2 which would look more like the VP3 source but this would be slower as put_no_rnd_pixels_tab is better optimzed |
2204 if(motion_halfpel_index != 3){ | |
2205 s->dsp.put_no_rnd_pixels_tab[1][motion_halfpel_index]( | |
2206 output_plane + s->all_fragments[i].first_pixel, | |
2207 motion_source, stride, 8); | |
2208 }else{ | |
2209 int d= (motion_x ^ motion_y)>>31; // d is 0 if motion_x and _y have the same sign, else -1 | |
2210 s->dsp.put_no_rnd_pixels_l2[1]( | |
2211 output_plane + s->all_fragments[i].first_pixel, | |
2212 motion_source - d, | |
2213 motion_source + stride + 1 + d, | |
2214 stride, 8); | |
2215 } | |
2684 | 2216 dequantizer = s->inter_dequant; |
2217 }else{ | |
2218 if (plane == 0) | |
2219 dequantizer = s->intra_y_dequant; | |
2220 else | |
2221 dequantizer = s->intra_c_dequant; | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2222 } |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2223 |
1224 | 2224 /* dequantize the DCT coefficients */ |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2225 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
|
2226 i, s->all_fragments[i].coding_method, |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2227 s->all_fragments[i].coeffs[0], dequantizer[0]); |
1224 | 2228 |
2693 | 2229 if(s->avctx->idct_algo==FF_IDCT_VP3){ |
2230 for (j = 0; j < 64; j++) { | |
2231 s->all_fragments[i].coeffs[j] *= dequantizer[j]; | |
2232 } | |
2233 }else{ | |
2234 for (j = 0; j < 64; j++) { | |
2235 s->all_fragments[i].coeffs[j]= (dequantizer[j] * s->all_fragments[i].coeffs[j] + 2) >> 2; | |
2236 } | |
2237 } | |
2238 | |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2239 /* invert DCT and place (or add) in final output */ |
2693 | 2240 |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2241 if (s->all_fragments[i].coding_method == MODE_INTRA) { |
2693 | 2242 if(s->avctx->idct_algo!=FF_IDCT_VP3) |
2243 s->all_fragments[i].coeffs[0] += 128<<3; | |
2244 s->dsp.idct_put( | |
1984
ef919e9ef73e
separate out put_signed_pixels_clamped() into its own function and
melanson
parents:
1977
diff
changeset
|
2245 output_plane + s->all_fragments[i].first_pixel, |
2693 | 2246 stride, |
2247 s->all_fragments[i].coeffs); | |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2248 } else { |
2693 | 2249 s->dsp.idct_add( |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2250 output_plane + s->all_fragments[i].first_pixel, |
2693 | 2251 stride, |
2252 s->all_fragments[i].coeffs); | |
1230
31d090bae36c
looking better all the time! motion compensation is starting to work
tmmm
parents:
1229
diff
changeset
|
2253 } |
2693 | 2254 memset(s->all_fragments[i].coeffs, 0, 64*sizeof(DCTELEM)); |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2255 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2256 debug_idct("block after idct_%s():\n", |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2257 (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
|
2258 "put" : "add"); |
1224 | 2259 for (m = 0; m < 8; m++) { |
2260 for (n = 0; n < 8; n++) { | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2261 debug_idct(" %3d", *(output_plane + |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2262 s->all_fragments[i].first_pixel + (m * stride + n))); |
1224 | 2263 } |
2264 debug_idct("\n"); | |
2265 } | |
2266 debug_idct("\n"); | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2267 |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2268 } else { |
1224 | 2269 |
2270 /* copy directly from the previous frame */ | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2271 s->dsp.put_pixels_tab[1][0]( |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2272 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
|
2273 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
|
2274 stride, 8); |
1224 | 2275 |
2276 } | |
2277 } | |
2278 } | |
2279 | |
2280 emms_c(); | |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2281 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2282 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2283 static void horizontal_filter(unsigned char *first_pixel, int stride, |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2284 int *bounding_values) |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2285 { |
2699
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2286 unsigned char *end; |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2287 int filter_value; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2288 |
2699
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2289 for (end= first_pixel + 8*stride; first_pixel < end; first_pixel += stride) { |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2290 filter_value = |
2699
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2291 (first_pixel[-2] - first_pixel[ 1]) |
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2292 +3*(first_pixel[ 0] - first_pixel[-1]); |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2293 filter_value = bounding_values[(filter_value + 4) >> 3]; |
2698
fae7fce1a202
SATURATE_U8 -> clip_uint8 (10% faster loop filter)
michael
parents:
2695
diff
changeset
|
2294 first_pixel[-1] = clip_uint8(first_pixel[-1] + filter_value); |
fae7fce1a202
SATURATE_U8 -> clip_uint8 (10% faster loop filter)
michael
parents:
2695
diff
changeset
|
2295 first_pixel[ 0] = clip_uint8(first_pixel[ 0] - filter_value); |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2296 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2297 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2298 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2299 static void vertical_filter(unsigned char *first_pixel, int stride, |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2300 int *bounding_values) |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2301 { |
2699
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2302 unsigned char *end; |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2303 int filter_value; |
2699
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2304 const int nstride= -stride; |
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2305 |
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2306 for (end= first_pixel + 8; first_pixel < end; first_pixel++) { |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2307 filter_value = |
2699
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2308 (first_pixel[2 * nstride] - first_pixel[ stride]) |
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2309 +3*(first_pixel[0 ] - first_pixel[nstride]); |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2310 filter_value = bounding_values[(filter_value + 4) >> 3]; |
2699
1b4a3c083f9d
some optimizations gcc should have done (10% faster loop filter)
michael
parents:
2698
diff
changeset
|
2311 first_pixel[nstride] = clip_uint8(first_pixel[nstride] + filter_value); |
2698
fae7fce1a202
SATURATE_U8 -> clip_uint8 (10% faster loop filter)
michael
parents:
2695
diff
changeset
|
2312 first_pixel[0] = clip_uint8(first_pixel[0] - filter_value); |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2313 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2314 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2315 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2316 static void apply_loop_filter(Vp3DecodeContext *s) |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2317 { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2318 int x, y, plane; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2319 int width, height; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2320 int fragment; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2321 int stride; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2322 unsigned char *plane_data; |
2686 | 2323 |
2324 int bounding_values_array[256]; | |
2325 int *bounding_values= bounding_values_array+127; | |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2326 int filter_limit; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2327 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2328 /* find the right loop limit value */ |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2329 for (x = 63; x >= 0; x--) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2330 if (vp31_ac_scale_factor[x] >= s->quality_index) |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2331 break; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2332 } |
2686 | 2333 filter_limit = vp31_filter_limit_values[s->quality_index]; |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2334 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2335 /* set up the bounding values */ |
2686 | 2336 memset(bounding_values_array, 0, 256 * sizeof(int)); |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2337 for (x = 0; x < filter_limit; x++) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2338 bounding_values[-x - filter_limit] = -filter_limit + x; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2339 bounding_values[-x] = -x; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2340 bounding_values[x] = x; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2341 bounding_values[x + filter_limit] = filter_limit - x; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2342 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2343 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2344 for (plane = 0; plane < 3; plane++) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2345 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2346 if (plane == 0) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2347 /* Y plane parameters */ |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2348 fragment = 0; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2349 width = s->fragment_width; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2350 height = s->fragment_height; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2351 stride = s->current_frame.linesize[0]; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2352 plane_data = s->current_frame.data[0]; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2353 } else if (plane == 1) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2354 /* U plane parameters */ |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2355 fragment = s->u_fragment_start; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2356 width = s->fragment_width / 2; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2357 height = s->fragment_height / 2; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2358 stride = s->current_frame.linesize[1]; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2359 plane_data = s->current_frame.data[1]; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2360 } else { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2361 /* V plane parameters */ |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2362 fragment = s->v_fragment_start; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2363 width = s->fragment_width / 2; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2364 height = s->fragment_height / 2; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2365 stride = s->current_frame.linesize[2]; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2366 plane_data = s->current_frame.data[2]; |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2367 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2368 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2369 for (y = 0; y < height; y++) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2370 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2371 for (x = 0; x < width; x++) { |
2687 | 2372 START_TIMER |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2373 /* do not perform left edge filter for left columns frags */ |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2374 if ((x > 0) && |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2375 (s->all_fragments[fragment].coding_method != MODE_COPY)) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2376 horizontal_filter( |
2686 | 2377 plane_data + s->all_fragments[fragment].first_pixel - 7*stride, |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2378 stride, bounding_values); |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2379 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2380 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2381 /* do not perform top edge filter for top row fragments */ |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2382 if ((y > 0) && |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2383 (s->all_fragments[fragment].coding_method != MODE_COPY)) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2384 vertical_filter( |
2686 | 2385 plane_data + s->all_fragments[fragment].first_pixel + stride, |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2386 stride, bounding_values); |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2387 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2388 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2389 /* do not perform right edge filter for right column |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2390 * fragments or if right fragment neighbor is also coded |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2391 * in this frame (it will be filtered in next iteration) */ |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2392 if ((x < width - 1) && |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2393 (s->all_fragments[fragment].coding_method != MODE_COPY) && |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2394 (s->all_fragments[fragment + 1].coding_method == MODE_COPY)) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2395 horizontal_filter( |
2686 | 2396 plane_data + s->all_fragments[fragment + 1].first_pixel - 7*stride, |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2397 stride, bounding_values); |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2398 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2399 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2400 /* do not perform bottom edge filter for bottom row |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2401 * fragments or if bottom fragment neighbor is also coded |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2402 * in this frame (it will be filtered in the next row) */ |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2403 if ((y < height - 1) && |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2404 (s->all_fragments[fragment].coding_method != MODE_COPY) && |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2405 (s->all_fragments[fragment + width].coding_method == MODE_COPY)) { |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2406 vertical_filter( |
2686 | 2407 plane_data + s->all_fragments[fragment + width].first_pixel + stride, |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2408 stride, bounding_values); |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2409 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2410 |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2411 fragment++; |
2687 | 2412 STOP_TIMER("loop filter") |
2531
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2413 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2414 } |
eed7d92a1dfc
VP3 post-processing loop filter; disabled until the correct final step
melanson
parents:
2466
diff
changeset
|
2415 } |
1224 | 2416 } |
2417 | |
2418 /* | |
2419 * This function computes the first pixel addresses for each fragment. | |
2420 * This function needs to be invoked after the first frame is allocated | |
2421 * so that it has access to the plane strides. | |
2422 */ | |
2423 static void vp3_calculate_pixel_addresses(Vp3DecodeContext *s) | |
2424 { | |
2425 | |
2426 int i, x, y; | |
2427 | |
2428 /* figure out the first pixel addresses for each of the fragments */ | |
2429 /* Y plane */ | |
2430 i = 0; | |
2431 for (y = s->fragment_height; y > 0; y--) { | |
2432 for (x = 0; x < s->fragment_width; x++) { | |
2433 s->all_fragments[i++].first_pixel = | |
2434 s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS - | |
2435 s->golden_frame.linesize[0] + | |
2436 x * FRAGMENT_PIXELS; | |
2437 debug_init(" fragment %d, first pixel @ %d\n", | |
2438 i-1, s->all_fragments[i-1].first_pixel); | |
2439 } | |
2440 } | |
2441 | |
2442 /* U plane */ | |
2443 i = s->u_fragment_start; | |
2444 for (y = s->fragment_height / 2; y > 0; y--) { | |
2445 for (x = 0; x < s->fragment_width / 2; x++) { | |
2446 s->all_fragments[i++].first_pixel = | |
2447 s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS - | |
2448 s->golden_frame.linesize[1] + | |
2449 x * FRAGMENT_PIXELS; | |
2450 debug_init(" fragment %d, first pixel @ %d\n", | |
2451 i-1, s->all_fragments[i-1].first_pixel); | |
2452 } | |
2453 } | |
2454 | |
2455 /* V plane */ | |
2456 i = s->v_fragment_start; | |
2457 for (y = s->fragment_height / 2; y > 0; y--) { | |
2458 for (x = 0; x < s->fragment_width / 2; x++) { | |
2459 s->all_fragments[i++].first_pixel = | |
2460 s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS - | |
2461 s->golden_frame.linesize[2] + | |
2462 x * FRAGMENT_PIXELS; | |
2463 debug_init(" fragment %d, first pixel @ %d\n", | |
2464 i-1, s->all_fragments[i-1].first_pixel); | |
2465 } | |
2466 } | |
2467 } | |
2468 | |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2469 /* FIXME: this should be merged with the above! */ |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2470 static void theora_calculate_pixel_addresses(Vp3DecodeContext *s) |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2471 { |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2472 |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2473 int i, x, y; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2474 |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2475 /* figure out the first pixel addresses for each of the fragments */ |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2476 /* Y plane */ |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2477 i = 0; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2478 for (y = 1; y <= s->fragment_height; y++) { |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2479 for (x = 0; x < s->fragment_width; x++) { |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2480 s->all_fragments[i++].first_pixel = |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2481 s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS - |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2482 s->golden_frame.linesize[0] + |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2483 x * FRAGMENT_PIXELS; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2484 debug_init(" fragment %d, first pixel @ %d\n", |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2485 i-1, s->all_fragments[i-1].first_pixel); |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2486 } |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2487 } |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2488 |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2489 /* U plane */ |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2490 i = s->u_fragment_start; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2491 for (y = 1; y <= s->fragment_height / 2; y++) { |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2492 for (x = 0; x < s->fragment_width / 2; x++) { |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2493 s->all_fragments[i++].first_pixel = |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2494 s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS - |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2495 s->golden_frame.linesize[1] + |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2496 x * FRAGMENT_PIXELS; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2497 debug_init(" fragment %d, first pixel @ %d\n", |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2498 i-1, s->all_fragments[i-1].first_pixel); |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2499 } |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2500 } |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2501 |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2502 /* V plane */ |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2503 i = s->v_fragment_start; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2504 for (y = 1; y <= s->fragment_height / 2; y++) { |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2505 for (x = 0; x < s->fragment_width / 2; x++) { |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2506 s->all_fragments[i++].first_pixel = |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2507 s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS - |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2508 s->golden_frame.linesize[2] + |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2509 x * FRAGMENT_PIXELS; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2510 debug_init(" fragment %d, first pixel @ %d\n", |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2511 i-1, s->all_fragments[i-1].first_pixel); |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2512 } |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2513 } |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2514 } |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2515 |
1224 | 2516 /* |
2517 * This is the ffmpeg/libavcodec API init function. | |
2518 */ | |
2519 static int vp3_decode_init(AVCodecContext *avctx) | |
2520 { | |
2521 Vp3DecodeContext *s = avctx->priv_data; | |
2522 int i; | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2523 int c_width; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2524 int c_height; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2525 int y_superblock_count; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2526 int c_superblock_count; |
1224 | 2527 |
1664 | 2528 if (avctx->codec_tag == MKTAG('V','P','3','0')) |
2529 s->version = 0; | |
2530 else | |
2531 s->version = 1; | |
2532 | |
1224 | 2533 s->avctx = avctx; |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2534 s->width = (avctx->width + 15) & 0xFFFFFFF0; |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2535 s->height = (avctx->height + 15) & 0xFFFFFFF0; |
1224 | 2536 avctx->pix_fmt = PIX_FMT_YUV420P; |
2537 avctx->has_b_frames = 0; | |
2693 | 2538 if(avctx->idct_algo==FF_IDCT_AUTO) |
2539 avctx->idct_algo=FF_IDCT_VP3; | |
1224 | 2540 dsputil_init(&s->dsp, avctx); |
2694 | 2541 |
2542 ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct); | |
1224 | 2543 |
2544 /* initialize to an impossible value which will force a recalculation | |
2545 * in the first frame decode */ | |
2546 s->quality_index = -1; | |
2547 | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2548 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
|
2549 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
|
2550 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
|
2551 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2552 /* 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
|
2553 c_width = s->width / 2; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2554 c_height = s->height / 2; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2555 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
|
2556 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
|
2557 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
|
2558 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2559 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
|
2560 s->u_superblock_start = y_superblock_count; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2561 s->v_superblock_start = s->u_superblock_start + c_superblock_count; |
1224 | 2562 s->superblock_coding = av_malloc(s->superblock_count); |
2563 | |
2564 s->macroblock_width = (s->width + 15) / 16; | |
2565 s->macroblock_height = (s->height + 15) / 16; | |
2566 s->macroblock_count = s->macroblock_width * s->macroblock_height; | |
2567 | |
2568 s->fragment_width = s->width / FRAGMENT_PIXELS; | |
2569 s->fragment_height = s->height / FRAGMENT_PIXELS; | |
2570 | |
2571 /* fragment count covers all 8x8 blocks for all 3 planes */ | |
2572 s->fragment_count = s->fragment_width * s->fragment_height * 3 / 2; | |
2573 s->u_fragment_start = s->fragment_width * s->fragment_height; | |
2574 s->v_fragment_start = s->fragment_width * s->fragment_height * 5 / 4; | |
2575 | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2576 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
|
2577 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
|
2578 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
|
2579 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
|
2580 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
|
2581 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
|
2582 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
|
2583 s->superblock_count, s->u_superblock_start, s->v_superblock_start); |
1224 | 2584 debug_init(" macroblocks: %d x %d, %d total\n", |
2585 s->macroblock_width, s->macroblock_height, s->macroblock_count); | |
2586 debug_init(" %d fragments, %d x %d, u starts @ %d, v starts @ %d\n", | |
2587 s->fragment_count, | |
2588 s->fragment_width, | |
2589 s->fragment_height, | |
2590 s->u_fragment_start, | |
2591 s->v_fragment_start); | |
2592 | |
2593 s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment)); | |
2689
ed0ab6f82167
clear blocks after each idct instead of per picture
michael
parents:
2687
diff
changeset
|
2594 s->coeffs = av_malloc(s->fragment_count * sizeof(DCTELEM) * 64); |
1224 | 2595 s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int)); |
2596 s->pixel_addresses_inited = 0; | |
2597 | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2598 if (!s->theora_tables) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2599 { |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2600 for (i = 0; i < 64; i++) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2601 s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i]; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2602 for (i = 0; i < 64; i++) |
1867
7f7aa6ac3723
cut over to using new VP3 DSP functions and remove the old ones; bring
melanson
parents:
1864
diff
changeset
|
2603 s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i]; |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2604 for (i = 0; i < 64; i++) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2605 s->coded_intra_y_dequant[i] = vp31_intra_y_dequant[i]; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2606 for (i = 0; i < 64; i++) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2607 s->coded_intra_c_dequant[i] = vp31_intra_c_dequant[i]; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2608 for (i = 0; i < 64; i++) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2609 s->coded_inter_dequant[i] = vp31_inter_dequant[i]; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2610 } |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2611 |
1224 | 2612 /* init VLC tables */ |
2613 for (i = 0; i < 16; i++) { | |
2614 | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
2615 /* DC histograms */ |
1224 | 2616 init_vlc(&s->dc_vlc[i], 5, 32, |
2617 &dc_bias[i][0][1], 4, 2, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2173
diff
changeset
|
2618 &dc_bias[i][0][0], 4, 2, 0); |
1224 | 2619 |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2620 /* group 1 AC histograms */ |
1224 | 2621 init_vlc(&s->ac_vlc_1[i], 5, 32, |
2622 &ac_bias_0[i][0][1], 4, 2, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2173
diff
changeset
|
2623 &ac_bias_0[i][0][0], 4, 2, 0); |
1224 | 2624 |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2625 /* group 2 AC histograms */ |
1224 | 2626 init_vlc(&s->ac_vlc_2[i], 5, 32, |
2627 &ac_bias_1[i][0][1], 4, 2, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2173
diff
changeset
|
2628 &ac_bias_1[i][0][0], 4, 2, 0); |
1224 | 2629 |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2630 /* group 3 AC histograms */ |
1224 | 2631 init_vlc(&s->ac_vlc_3[i], 5, 32, |
2632 &ac_bias_2[i][0][1], 4, 2, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2173
diff
changeset
|
2633 &ac_bias_2[i][0][0], 4, 2, 0); |
1224 | 2634 |
1233
5d66713e97e2
correct the custom coding mode alphabet, add some validation on the
tmmm
parents:
1230
diff
changeset
|
2635 /* group 4 AC histograms */ |
1224 | 2636 init_vlc(&s->ac_vlc_4[i], 5, 32, |
2637 &ac_bias_3[i][0][1], 4, 2, | |
2370
26560d4fdb1f
Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents:
2173
diff
changeset
|
2638 &ac_bias_3[i][0][0], 4, 2, 0); |
1224 | 2639 } |
2640 | |
2703
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
2641 init_vlc(&s->superblock_run_length_vlc, 6, 34, |
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
2642 &superblock_run_length_vlc_table[0][1], 4, 2, |
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
2643 &superblock_run_length_vlc_table[0][0], 4, 2, 0); |
3817945001ce
replace get_superblock_run_length() with a VLC table
melanson
parents:
2702
diff
changeset
|
2644 |
2702
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2645 init_vlc(&s->fragment_run_length_vlc, 5, 31, |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2646 &fragment_run_length_vlc_table[0][1], 4, 2, |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2647 &fragment_run_length_vlc_table[0][0], 4, 2, 0); |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2648 |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2649 init_vlc(&s->mode_code_vlc, 3, 8, |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2650 &mode_code_vlc_table[0][1], 2, 1, |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2651 &mode_code_vlc_table[0][0], 2, 1, 0); |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2652 |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2653 init_vlc(&s->motion_vector_vlc, 6, 63, |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2654 &motion_vector_vlc_table[0][1], 2, 1, |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2655 &motion_vector_vlc_table[0][0], 2, 1, 0); |
5a4e5225cbb6
use VLCs for in place of get_fragment_run_length(), get_mode_code(), and
melanson
parents:
2699
diff
changeset
|
2656 |
1224 | 2657 /* work out the block mapping tables */ |
2658 s->superblock_fragments = av_malloc(s->superblock_count * 16 * sizeof(int)); | |
2659 s->superblock_macroblocks = av_malloc(s->superblock_count * 4 * sizeof(int)); | |
2660 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
|
2661 s->macroblock_coding = av_malloc(s->macroblock_count + 1); |
1224 | 2662 init_block_mapping(s); |
2663 | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2664 for (i = 0; i < 3; i++) { |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2665 s->current_frame.data[i] = NULL; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2666 s->last_frame.data[i] = NULL; |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2667 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
|
2668 } |
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2669 |
1224 | 2670 return 0; |
2671 } | |
2672 | |
2673 /* | |
2674 * This is the ffmpeg/libavcodec API frame decode function. | |
2675 */ | |
2676 static int vp3_decode_frame(AVCodecContext *avctx, | |
2677 void *data, int *data_size, | |
2678 uint8_t *buf, int buf_size) | |
2679 { | |
2680 Vp3DecodeContext *s = avctx->priv_data; | |
2681 GetBitContext gb; | |
2682 static int counter = 0; | |
2683 | |
2684 init_get_bits(&gb, buf, buf_size * 8); | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2685 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2686 if (s->theora && get_bits1(&gb)) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2687 { |
1664 | 2688 int ptype = get_bits(&gb, 7); |
2689 | |
2690 skip_bits(&gb, 6*8); /* "theora" */ | |
2691 | |
2692 switch(ptype) | |
2693 { | |
2694 case 1: | |
2695 theora_decode_comments(avctx, gb); | |
2696 break; | |
2697 case 2: | |
2698 theora_decode_tables(avctx, gb); | |
2699 init_dequantizer(s); | |
2700 break; | |
2701 default: | |
2702 av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype); | |
2703 } | |
2704 return buf_size; | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2705 } |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2706 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2707 s->keyframe = !get_bits1(&gb); |
1664 | 2708 if (!s->theora) |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2709 skip_bits(&gb, 1); |
1664 | 2710 s->last_quality_index = s->quality_index; |
2711 s->quality_index = get_bits(&gb, 6); | |
2678 | 2712 if (s->theora >= 0x030200) |
1664 | 2713 skip_bits1(&gb); |
1224 | 2714 |
1667 | 2715 if (s->avctx->debug & FF_DEBUG_PICT_INFO) |
2716 av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n", | |
2717 s->keyframe?"key":"", counter, s->quality_index); | |
1224 | 2718 counter++; |
2719 | |
1292
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2720 if (s->quality_index != s->last_quality_index) |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2721 init_dequantizer(s); |
f7b3fa4bb7ae
revising and fixing motion vectors, squished block unpacking bug that
tmmm
parents:
1282
diff
changeset
|
2722 |
1224 | 2723 if (s->keyframe) { |
1664 | 2724 if (!s->theora) |
2725 { | |
2726 skip_bits(&gb, 4); /* width code */ | |
2727 skip_bits(&gb, 4); /* height code */ | |
2728 if (s->version) | |
2729 { | |
2730 s->version = get_bits(&gb, 5); | |
2731 if (counter == 1) | |
2732 av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version); | |
2733 } | |
2734 } | |
2735 if (s->version || s->theora) | |
2736 { | |
2737 if (get_bits1(&gb)) | |
2738 av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n"); | |
2739 skip_bits(&gb, 2); /* reserved? */ | |
2740 } | |
2741 | |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2742 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
|
2743 if (s->golden_frame.data[0]) |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2744 avctx->release_buffer(avctx, &s->golden_frame); |
1405
e69f99ade5b0
fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents:
1355
diff
changeset
|
2745 s->last_frame= s->golden_frame; /* ensure that we catch any access to this released frame */ |
1244
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2746 } else { |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2747 if (s->golden_frame.data[0]) |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2748 avctx->release_buffer(avctx, &s->golden_frame); |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2749 if (s->last_frame.data[0]) |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2750 avctx->release_buffer(avctx, &s->last_frame); |
a02df1ba6c7f
fix image buffer leak on keyframes, add more error condition checks
tmmm
parents:
1240
diff
changeset
|
2751 } |
1224 | 2752 |
1405
e69f99ade5b0
fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents:
1355
diff
changeset
|
2753 s->golden_frame.reference = 3; |
1224 | 2754 if(avctx->get_buffer(avctx, &s->golden_frame) < 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
2755 av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n"); |
1224 | 2756 return -1; |
2757 } | |
2758 | |
2759 /* 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
|
2760 memcpy(&s->current_frame, &s->golden_frame, sizeof(AVFrame)); |
1224 | 2761 |
2762 /* time to figure out pixel addresses? */ | |
2763 if (!s->pixel_addresses_inited) | |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2764 { |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2765 if (!s->flipped_image) |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2766 vp3_calculate_pixel_addresses(s); |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2767 else |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2768 theora_calculate_pixel_addresses(s); |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2769 } |
1224 | 2770 } else { |
2771 /* allocate a new current frame */ | |
1405
e69f99ade5b0
fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents:
1355
diff
changeset
|
2772 s->current_frame.reference = 3; |
1224 | 2773 if(avctx->get_buffer(avctx, &s->current_frame) < 0) { |
1598
932d306bf1dc
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents:
1518
diff
changeset
|
2774 av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n"); |
1224 | 2775 return -1; |
2776 } | |
2777 } | |
2778 | |
1407 | 2779 s->current_frame.qscale_table= s->qscale_table; //FIXME allocate individual tables per AVFrame |
2780 s->current_frame.qstride= 0; | |
2781 | |
2687 | 2782 {START_TIMER |
1224 | 2783 init_frame(s, &gb); |
2687 | 2784 STOP_TIMER("init_frame")} |
1224 | 2785 |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2786 #if KEYFRAMES_ONLY |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2787 if (!s->keyframe) { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2788 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2789 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
|
2790 s->current_frame.linesize[0] * s->height); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2791 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
|
2792 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
|
2793 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
|
2794 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
|
2795 |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2796 } else { |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2797 #endif |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2798 |
2687 | 2799 {START_TIMER |
2800 if (unpack_superblocks(s, &gb)){ | |
2801 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n"); | |
2802 return -1; | |
2803 } | |
2804 STOP_TIMER("unpack_superblocks")} | |
2805 {START_TIMER | |
2806 if (unpack_modes(s, &gb)){ | |
2807 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_modes\n"); | |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2808 return -1; |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2809 } |
2687 | 2810 STOP_TIMER("unpack_modes")} |
2811 {START_TIMER | |
2812 if (unpack_vectors(s, &gb)){ | |
2813 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n"); | |
2814 return -1; | |
2815 } | |
2816 STOP_TIMER("unpack_vectors")} | |
2817 {START_TIMER | |
2818 if (unpack_dct_coeffs(s, &gb)){ | |
2819 av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n"); | |
2820 return -1; | |
2821 } | |
2822 STOP_TIMER("unpack_dct_coeffs")} | |
2823 {START_TIMER | |
1224 | 2824 |
2825 reverse_dc_prediction(s, 0, s->fragment_width, s->fragment_height); | |
2687 | 2826 STOP_TIMER("reverse_dc_prediction")} |
2827 {START_TIMER | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2828 render_fragments(s, 0, s->width, s->height, 0); |
2687 | 2829 STOP_TIMER("render_fragments")} |
1355
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2830 |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2831 if ((avctx->flags & CODEC_FLAG_GRAY) == 0) { |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2832 reverse_dc_prediction(s, s->u_fragment_start, |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2833 s->fragment_width / 2, s->fragment_height / 2); |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2834 reverse_dc_prediction(s, s->v_fragment_start, |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2835 s->fragment_width / 2, s->fragment_height / 2); |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2836 render_fragments(s, s->u_fragment_start, s->width / 2, s->height / 2, 1); |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2837 render_fragments(s, s->v_fragment_start, s->width / 2, s->height / 2, 2); |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2838 } else { |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2839 memset(s->current_frame.data[1], 0x80, s->width * s->height / 4); |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2840 memset(s->current_frame.data[2], 0x80, s->width * s->height / 4); |
1c05f4290517
added the official VP3 IDCT (C implementation) as well as a grayscale
tmmm
parents:
1292
diff
changeset
|
2841 } |
1224 | 2842 |
2687 | 2843 {START_TIMER |
2686 | 2844 apply_loop_filter(s); |
2687 | 2845 STOP_TIMER("apply_loop_filter")} |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2846 #if KEYFRAMES_ONLY |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2847 } |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2848 #endif |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2849 |
1224 | 2850 *data_size=sizeof(AVFrame); |
2851 *(AVFrame*)data= s->current_frame; | |
2852 | |
1229
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2853 /* 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
|
2854 * golden frame */ |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2855 if ((s->last_frame.data[0]) && |
cefec170ee46
fixed buffer allocation logic (hopefully) so that decoder does not crash
tmmm
parents:
1227
diff
changeset
|
2856 (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
|
2857 avctx->release_buffer(avctx, &s->last_frame); |
1224 | 2858 |
1227
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2859 /* shuffle frames (last = current) */ |
184c480cefc3
fix decoder so that ffmpeg does not crash, at least not right away
tmmm
parents:
1224
diff
changeset
|
2860 memcpy(&s->last_frame, &s->current_frame, sizeof(AVFrame)); |
1405
e69f99ade5b0
fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents:
1355
diff
changeset
|
2861 s->current_frame.data[0]= NULL; /* ensure that we catch any access to this released frame */ |
1224 | 2862 |
2863 return buf_size; | |
2864 } | |
2865 | |
2866 /* | |
2867 * This is the ffmpeg/libavcodec API module cleanup function. | |
2868 */ | |
2869 static int vp3_decode_end(AVCodecContext *avctx) | |
2870 { | |
2871 Vp3DecodeContext *s = avctx->priv_data; | |
2872 | |
2873 av_free(s->all_fragments); | |
2689
ed0ab6f82167
clear blocks after each idct instead of per picture
michael
parents:
2687
diff
changeset
|
2874 av_free(s->coeffs); |
1224 | 2875 av_free(s->coded_fragment_list); |
2876 av_free(s->superblock_fragments); | |
2877 av_free(s->superblock_macroblocks); | |
2878 av_free(s->macroblock_fragments); | |
1240
c95ff60bc1a1
fix motion vector decoding bug and reinstate interframes
tmmm
parents:
1239
diff
changeset
|
2879 av_free(s->macroblock_coding); |
1405
e69f99ade5b0
fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents:
1355
diff
changeset
|
2880 |
1224 | 2881 /* release all frames */ |
1405
e69f99ade5b0
fix AVFrame.reference (the frames are used for decoding future frames so it should be !=0)
michaelni
parents:
1355
diff
changeset
|
2882 if (s->golden_frame.data[0] && s->golden_frame.data[0] != s->last_frame.data[0]) |
1238
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2883 avctx->release_buffer(avctx, &s->golden_frame); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2884 if (s->last_frame.data[0]) |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2885 avctx->release_buffer(avctx, &s->last_frame); |
6eab0df78d47
squashed a bunch of subtle array indexing bugs, fixed block mapping
tmmm
parents:
1236
diff
changeset
|
2886 /* 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
|
2887 * to the same frame as either the golden or last frame */ |
1224 | 2888 |
2889 return 0; | |
2890 } | |
2891 | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2892 static int theora_decode_header(AVCodecContext *avctx, GetBitContext gb) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2893 { |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2894 Vp3DecodeContext *s = avctx->priv_data; |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2895 int major, minor, micro; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2896 |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2897 major = get_bits(&gb, 8); /* version major */ |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2898 minor = get_bits(&gb, 8); /* version minor */ |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2899 micro = get_bits(&gb, 8); /* version micro */ |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2900 av_log(avctx, AV_LOG_INFO, "Theora bitstream version %d.%d.%d\n", |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2901 major, minor, micro); |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2902 |
1627
a80b15c0b9d5
theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents:
1626
diff
changeset
|
2903 /* FIXME: endianess? */ |
a80b15c0b9d5
theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents:
1626
diff
changeset
|
2904 s->theora = (major << 16) | (minor << 8) | micro; |
a80b15c0b9d5
theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents:
1626
diff
changeset
|
2905 |
2678 | 2906 /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 */ |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2907 /* but previous versions have the image flipped relative to vp3 */ |
2678 | 2908 if (s->theora < 0x030200) |
1626
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2909 { |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2910 s->flipped_image = 1; |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2911 av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n"); |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2912 } |
f74ae637ffa9
finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)
alex
parents:
1598
diff
changeset
|
2913 |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2914 s->width = get_bits(&gb, 16) << 4; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2915 s->height = get_bits(&gb, 16) << 4; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2916 |
2422 | 2917 if(avcodec_check_dimensions(avctx, s->width, s->height)){ |
2918 s->width= s->height= 0; | |
2919 return -1; | |
2920 } | |
2921 | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2922 skip_bits(&gb, 24); /* frame width */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2923 skip_bits(&gb, 24); /* frame height */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2924 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2925 skip_bits(&gb, 8); /* offset x */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2926 skip_bits(&gb, 8); /* offset y */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2927 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2928 skip_bits(&gb, 32); /* fps numerator */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2929 skip_bits(&gb, 32); /* fps denumerator */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2930 skip_bits(&gb, 24); /* aspect numerator */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2931 skip_bits(&gb, 24); /* aspect denumerator */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2932 |
2678 | 2933 if (s->theora < 0x030200) |
1627
a80b15c0b9d5
theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents:
1626
diff
changeset
|
2934 skip_bits(&gb, 5); /* keyframe frequency force */ |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2935 skip_bits(&gb, 8); /* colorspace */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2936 skip_bits(&gb, 24); /* bitrate */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2937 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2938 skip_bits(&gb, 6); /* last(?) quality index */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2939 |
2678 | 2940 if (s->theora >= 0x030200) |
1627
a80b15c0b9d5
theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents:
1626
diff
changeset
|
2941 { |
a80b15c0b9d5
theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents:
1626
diff
changeset
|
2942 skip_bits(&gb, 5); /* keyframe frequency force */ |
a80b15c0b9d5
theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents:
1626
diff
changeset
|
2943 skip_bits(&gb, 5); /* spare bits */ |
a80b15c0b9d5
theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents:
1626
diff
changeset
|
2944 } |
a80b15c0b9d5
theora alpha3 support (with maintaining backward compatibility, maybe we should remove all backward compatibility codes after final theora release?)
alex
parents:
1626
diff
changeset
|
2945 |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2946 // align_get_bits(&gb); |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2947 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2948 avctx->width = s->width; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2949 avctx->height = s->height; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2950 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2951 return 0; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2952 } |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2953 |
1518 | 2954 static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb) |
2955 { | |
2956 int nb_comments, i, tmp; | |
2957 | |
2173 | 2958 tmp = get_bits_long(&gb, 32); |
1664 | 2959 tmp = be2me_32(tmp); |
2960 while(tmp--) | |
2961 skip_bits(&gb, 8); | |
1518 | 2962 |
2173 | 2963 nb_comments = get_bits_long(&gb, 32); |
1664 | 2964 nb_comments = be2me_32(nb_comments); |
1518 | 2965 for (i = 0; i < nb_comments; i++) |
2966 { | |
2173 | 2967 tmp = get_bits_long(&gb, 32); |
1664 | 2968 tmp = be2me_32(tmp); |
2969 while(tmp--) | |
1518 | 2970 skip_bits(&gb, 8); |
2971 } | |
2972 | |
2973 return 0; | |
2974 } | |
2975 | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2976 static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2977 { |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2978 Vp3DecodeContext *s = avctx->priv_data; |
2678 | 2979 int i, n; |
2980 | |
2981 if (s->theora >= 0x030200) { | |
2982 n = get_bits(&gb, 3); | |
2983 /* loop filter table */ | |
2984 for (i = 0; i < 64; i++) | |
2985 skip_bits(&gb, n); | |
2986 } | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2987 |
2678 | 2988 if (s->theora >= 0x030200) |
2989 n = get_bits(&gb, 4) + 1; | |
2990 else | |
2991 n = 16; | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2992 /* quality threshold table */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
2993 for (i = 0; i < 64; i++) |
2678 | 2994 s->coded_ac_scale_factor[i] = get_bits(&gb, n); |
2995 | |
2996 if (s->theora >= 0x030200) | |
2997 n = get_bits(&gb, 4) + 1; | |
2998 else | |
2999 n = 16; | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3000 /* dc scale factor table */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3001 for (i = 0; i < 64; i++) |
2678 | 3002 s->coded_dc_scale_factor[i] = get_bits(&gb, n); |
3003 | |
3004 if (s->theora >= 0x030200) | |
3005 n = get_bits(&gb, 9) + 1; | |
3006 else | |
3007 n = 3; | |
3008 if (n != 3) { | |
3009 av_log(NULL,AV_LOG_ERROR, "unsupported nbms : %d\n", n); | |
3010 return -1; | |
3011 } | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3012 /* y coeffs */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3013 for (i = 0; i < 64; i++) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3014 s->coded_intra_y_dequant[i] = get_bits(&gb, 8); |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3015 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3016 /* uv coeffs */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3017 for (i = 0; i < 64; i++) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3018 s->coded_intra_c_dequant[i] = get_bits(&gb, 8); |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3019 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3020 /* inter coeffs */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3021 for (i = 0; i < 64; i++) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3022 s->coded_inter_dequant[i] = get_bits(&gb, 8); |
1664 | 3023 |
3024 /* FIXME: read huffmann tree.. */ | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3025 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3026 s->theora_tables = 1; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3027 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3028 return 0; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3029 } |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3030 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3031 static int theora_decode_init(AVCodecContext *avctx) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3032 { |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3033 Vp3DecodeContext *s = avctx->priv_data; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3034 GetBitContext gb; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3035 int ptype; |
2533 | 3036 uint8_t *p= avctx->extradata; |
3037 int op_bytes, i; | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3038 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3039 s->theora = 1; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3040 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3041 if (!avctx->extradata_size) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3042 return -1; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3043 |
2533 | 3044 for(i=0;i<3;i++) { |
3045 op_bytes = *(p++)<<8; | |
3046 op_bytes += *(p++); | |
3047 | |
3048 init_get_bits(&gb, p, op_bytes); | |
3049 p += op_bytes; | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3050 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3051 ptype = get_bits(&gb, 8); |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3052 debug_vp3("Theora headerpacket type: %x\n", ptype); |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3053 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3054 if (!(ptype & 0x80)) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3055 return -1; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3056 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3057 skip_bits(&gb, 6*8); /* "theora" */ |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3058 |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3059 switch(ptype) |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3060 { |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3061 case 0x80: |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3062 theora_decode_header(avctx, gb); |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3063 break; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3064 case 0x81: |
1518 | 3065 theora_decode_comments(avctx, gb); |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3066 break; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3067 case 0x82: |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3068 theora_decode_tables(avctx, gb); |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3069 break; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3070 } |
2533 | 3071 } |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3072 |
2678 | 3073 vp3_decode_init(avctx); |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3074 return 0; |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3075 } |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3076 |
1224 | 3077 AVCodec vp3_decoder = { |
3078 "vp3", | |
3079 CODEC_TYPE_VIDEO, | |
3080 CODEC_ID_VP3, | |
3081 sizeof(Vp3DecodeContext), | |
3082 vp3_decode_init, | |
3083 NULL, | |
3084 vp3_decode_end, | |
3085 vp3_decode_frame, | |
3086 0, | |
3087 NULL | |
3088 }; | |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3089 |
2665 | 3090 #ifndef CONFIG_LIBTHEORA |
1516
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3091 AVCodec theora_decoder = { |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3092 "theora", |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3093 CODEC_TYPE_VIDEO, |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3094 CODEC_ID_THEORA, |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3095 sizeof(Vp3DecodeContext), |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3096 theora_decode_init, |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3097 NULL, |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3098 vp3_decode_end, |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3099 vp3_decode_frame, |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3100 0, |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3101 NULL |
0f0e9dfa6723
theora decoding support (only keyframes for now, because by theora the frame isn't flipped so the motion vectors are getting screwed up)
alex
parents:
1463
diff
changeset
|
3102 }; |
2665 | 3103 #endif |