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