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