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