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