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