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