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