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