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