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