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