Mercurial > libavcodec.hg
annotate aac.c @ 10306:c97a6cabee62 libavcodec
AAC: Add channel layout support for channel configuration as defined in the
specification
author | superdump |
---|---|
date | Mon, 28 Sep 2009 15:35:13 +0000 |
parents | 10df50768c02 |
children | 4e1d3e37bba0 |
rev | line source |
---|---|
7501 | 1 /* |
2 * AAC decoder | |
3 * Copyright (c) 2005-2006 Oded Shimon ( ods15 ods15 dyndns org ) | |
4 * Copyright (c) 2006-2007 Maxim Gavrilov ( maxim.gavrilov gmail com ) | |
5 * | |
6 * This file is part of FFmpeg. | |
7 * | |
8 * FFmpeg is free software; you can redistribute it and/or | |
9 * modify it under the terms of the GNU Lesser General Public | |
10 * License as published by the Free Software Foundation; either | |
11 * version 2.1 of the License, or (at your option) any later version. | |
12 * | |
13 * FFmpeg is distributed in the hope that it will be useful, | |
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 * Lesser General Public License for more details. | |
17 * | |
18 * You should have received a copy of the GNU Lesser General Public | |
19 * License along with FFmpeg; if not, write to the Free Software | |
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
21 */ | |
22 | |
23 /** | |
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8590
diff
changeset
|
24 * @file libavcodec/aac.c |
7501 | 25 * AAC decoder |
26 * @author Oded Shimon ( ods15 ods15 dyndns org ) | |
27 * @author Maxim Gavrilov ( maxim.gavrilov gmail com ) | |
28 */ | |
29 | |
30 /* | |
31 * supported tools | |
32 * | |
33 * Support? Name | |
34 * N (code in SoC repo) gain control | |
35 * Y block switching | |
36 * Y window shapes - standard | |
37 * N window shapes - Low Delay | |
38 * Y filterbank - standard | |
39 * N (code in SoC repo) filterbank - Scalable Sample Rate | |
40 * Y Temporal Noise Shaping | |
41 * N (code in SoC repo) Long Term Prediction | |
42 * Y intensity stereo | |
43 * Y channel coupling | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
44 * Y frequency domain prediction |
7501 | 45 * Y Perceptual Noise Substitution |
46 * Y Mid/Side stereo | |
47 * N Scalable Inverse AAC Quantization | |
48 * N Frequency Selective Switch | |
49 * N upsampling filter | |
50 * Y quantization & coding - AAC | |
51 * N quantization & coding - TwinVQ | |
52 * N quantization & coding - BSAC | |
53 * N AAC Error Resilience tools | |
54 * N Error Resilience payload syntax | |
55 * N Error Protection tool | |
56 * N CELP | |
57 * N Silence Compression | |
58 * N HVXC | |
59 * N HVXC 4kbits/s VR | |
60 * N Structured Audio tools | |
61 * N Structured Audio Sample Bank Format | |
62 * N MIDI | |
63 * N Harmonic and Individual Lines plus Noise | |
64 * N Text-To-Speech Interface | |
65 * N (in progress) Spectral Band Replication | |
66 * Y (not in this code) Layer-1 | |
67 * Y (not in this code) Layer-2 | |
68 * Y (not in this code) Layer-3 | |
69 * N SinuSoidal Coding (Transient, Sinusoid, Noise) | |
70 * N (planned) Parametric Stereo | |
71 * N Direct Stream Transfer | |
72 * | |
73 * Note: - HE AAC v1 comprises LC AAC with Spectral Band Replication. | |
74 * - HE AAC v2 comprises LC AAC with Spectral Band Replication and | |
75 Parametric Stereo. | |
76 */ | |
77 | |
78 | |
79 #include "avcodec.h" | |
8281
f93efc084e41
Make av_log_missing_feature an internal function, and change its name
stefano
parents:
8200
diff
changeset
|
80 #include "internal.h" |
9428 | 81 #include "get_bits.h" |
7501 | 82 #include "dsputil.h" |
7788
ffd4b1364b62
Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
vitor
parents:
7733
diff
changeset
|
83 #include "lpc.h" |
7501 | 84 |
85 #include "aac.h" | |
86 #include "aactab.h" | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
87 #include "aacdectab.h" |
7501 | 88 #include "mpeg4audio.h" |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
89 #include "aac_parser.h" |
7501 | 90 |
91 #include <assert.h> | |
92 #include <errno.h> | |
93 #include <math.h> | |
94 #include <string.h> | |
95 | |
10004 | 96 union float754 { |
97 float f; | |
98 uint32_t i; | |
99 }; | |
9179
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
100 |
7501 | 101 static VLC vlc_scalefactors; |
102 static VLC vlc_spectral[11]; | |
103 | |
104 | |
10004 | 105 static ChannelElement *get_che(AACContext *ac, int type, int elem_id) |
106 { | |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
107 if (ac->tag_che_map[type][elem_id]) { |
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
108 return ac->tag_che_map[type][elem_id]; |
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
109 } |
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
110 if (ac->tags_mapped >= tags_per_config[ac->m4ac.chan_config]) { |
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
111 return NULL; |
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
112 } |
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
113 switch (ac->m4ac.chan_config) { |
10004 | 114 case 7: |
115 if (ac->tags_mapped == 3 && type == TYPE_CPE) { | |
116 ac->tags_mapped++; | |
117 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][2]; | |
118 } | |
119 case 6: | |
120 /* Some streams incorrectly code 5.1 audio as SCE[0] CPE[0] CPE[1] SCE[1] | |
121 instead of SCE[0] CPE[0] CPE[0] LFE[0]. If we seem to have | |
122 encountered such a stream, transfer the LFE[0] element to SCE[1] */ | |
123 if (ac->tags_mapped == tags_per_config[ac->m4ac.chan_config] - 1 && (type == TYPE_LFE || type == TYPE_SCE)) { | |
124 ac->tags_mapped++; | |
125 return ac->tag_che_map[type][elem_id] = ac->che[TYPE_LFE][0]; | |
126 } | |
127 case 5: | |
128 if (ac->tags_mapped == 2 && type == TYPE_CPE) { | |
129 ac->tags_mapped++; | |
130 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][1]; | |
131 } | |
132 case 4: | |
133 if (ac->tags_mapped == 2 && ac->m4ac.chan_config == 4 && type == TYPE_SCE) { | |
134 ac->tags_mapped++; | |
135 return ac->tag_che_map[TYPE_SCE][elem_id] = ac->che[TYPE_SCE][1]; | |
136 } | |
137 case 3: | |
138 case 2: | |
139 if (ac->tags_mapped == (ac->m4ac.chan_config != 2) && type == TYPE_CPE) { | |
140 ac->tags_mapped++; | |
141 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][0]; | |
142 } else if (ac->m4ac.chan_config == 2) { | |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
143 return NULL; |
10004 | 144 } |
145 case 1: | |
146 if (!ac->tags_mapped && type == TYPE_SCE) { | |
147 ac->tags_mapped++; | |
148 return ac->tag_che_map[TYPE_SCE][elem_id] = ac->che[TYPE_SCE][0]; | |
149 } | |
150 default: | |
151 return NULL; | |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
152 } |
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
153 } |
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
154 |
7539 | 155 /** |
7578 | 156 * Configure output channel order based on the current program configuration element. |
157 * | |
158 * @param che_pos current channel position configuration | |
159 * @param new_che_pos New channel position configuration - we only do something if it differs from the current one. | |
160 * | |
161 * @return Returns error status. 0 - OK, !0 - error | |
162 */ | |
10004 | 163 static int output_configure(AACContext *ac, |
164 enum ChannelPosition che_pos[4][MAX_ELEM_ID], | |
165 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID], | |
166 int channel_config) | |
167 { | |
7578 | 168 AVCodecContext *avctx = ac->avccontext; |
169 int i, type, channels = 0; | |
170 | |
171 memcpy(che_pos, new_che_pos, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])); | |
172 | |
10306
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
173 if (channel_config) { |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
174 for (i = 0; i < tags_per_config[channel_config]; i++) { |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
175 const int id = aac_channel_layout_map[channel_config - 1][i][1]; |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
176 type = aac_channel_layout_map[channel_config - 1][i][0]; |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
177 |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
178 if (!ac->che[type][id] && !(ac->che[type][id] = av_mallocz(sizeof(ChannelElement)))) |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
179 return AVERROR(ENOMEM); |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
180 |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
181 if (type != TYPE_CCE) { |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
182 ac->output_data[channels++] = ac->che[type][id]->ch[0].ret; |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
183 if (type == TYPE_CPE) |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
184 ac->output_data[channels++] = ac->che[type][id]->ch[1].ret; |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
185 } |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
186 } |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
187 |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
188 memset(ac->tag_che_map, 0, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0])); |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
189 ac->tags_mapped = 0; |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
190 |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
191 avctx->channel_layout = aac_channel_layout[channel_config - 1]; |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
192 } else { |
7578 | 193 /* Allocate or free elements depending on if they are in the |
194 * current program configuration. | |
195 * | |
196 * Set up default 1:1 output mapping. | |
197 * | |
198 * For a 5.1 stream the output order will be: | |
7633
bf34cb99da5b
The comment about channel order for AAC 5.1 audio was not correct, fix it.
andoma
parents:
7632
diff
changeset
|
199 * [ Center ] [ Front Left ] [ Front Right ] [ LFE ] [ Surround Left ] [ Surround Right ] |
7578 | 200 */ |
201 | |
10004 | 202 for (i = 0; i < MAX_ELEM_ID; i++) { |
203 for (type = 0; type < 4; type++) { | |
204 if (che_pos[type][i]) { | |
205 if (!ac->che[type][i] && !(ac->che[type][i] = av_mallocz(sizeof(ChannelElement)))) | |
7578 | 206 return AVERROR(ENOMEM); |
10004 | 207 if (type != TYPE_CCE) { |
7578 | 208 ac->output_data[channels++] = ac->che[type][i]->ch[0].ret; |
10004 | 209 if (type == TYPE_CPE) { |
7578 | 210 ac->output_data[channels++] = ac->che[type][i]->ch[1].ret; |
211 } | |
212 } | |
213 } else | |
214 av_freep(&ac->che[type][i]); | |
215 } | |
216 } | |
217 | |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
218 memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0])); |
10004 | 219 ac->tags_mapped = 4 * MAX_ELEM_ID; |
10306
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
220 |
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
221 avctx->channel_layout = 0; |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
222 } |
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
223 |
7578 | 224 avctx->channels = channels; |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
225 |
9948
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
226 ac->output_configured = 1; |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
227 |
7578 | 228 return 0; |
229 } | |
230 | |
231 /** | |
7539 | 232 * Decode an array of 4 bit element IDs, optionally interleaved with a stereo/mono switching bit. |
233 * | |
234 * @param cpe_map Stereo (Channel Pair Element) map, NULL if stereo bit is not present. | |
235 * @param sce_map mono (Single Channel Element) map | |
236 * @param type speaker type/position for these channels | |
237 */ | |
238 static void decode_channel_map(enum ChannelPosition *cpe_map, | |
10004 | 239 enum ChannelPosition *sce_map, |
240 enum ChannelPosition type, | |
241 GetBitContext *gb, int n) | |
242 { | |
243 while (n--) { | |
7539 | 244 enum ChannelPosition *map = cpe_map && get_bits1(gb) ? cpe_map : sce_map; // stereo or mono map |
245 map[get_bits(gb, 4)] = type; | |
246 } | |
247 } | |
248 | |
249 /** | |
250 * Decode program configuration element; reference: table 4.2. | |
251 * | |
252 * @param new_che_pos New channel position configuration - we only do something if it differs from the current one. | |
253 * | |
254 * @return Returns error status. 0 - OK, !0 - error | |
255 */ | |
10004 | 256 static int decode_pce(AACContext *ac, enum ChannelPosition new_che_pos[4][MAX_ELEM_ID], |
257 GetBitContext *gb) | |
258 { | |
8412
2d48043ab521
AAC: Don't write an illegal sampling_index in a PCE to the MPEG4AudioConfig
superdump
parents:
8286
diff
changeset
|
259 int num_front, num_side, num_back, num_lfe, num_assoc_data, num_cc, sampling_index; |
7539 | 260 |
261 skip_bits(gb, 2); // object_type | |
262 | |
8412
2d48043ab521
AAC: Don't write an illegal sampling_index in a PCE to the MPEG4AudioConfig
superdump
parents:
8286
diff
changeset
|
263 sampling_index = get_bits(gb, 4); |
9716
d45e44454d13
In the event of a mismatch, do not follow the sample rate index in an AAC PCE.
alexc
parents:
9658
diff
changeset
|
264 if (ac->m4ac.sampling_index != sampling_index) |
d45e44454d13
In the event of a mismatch, do not follow the sample rate index in an AAC PCE.
alexc
parents:
9658
diff
changeset
|
265 av_log(ac->avccontext, AV_LOG_WARNING, "Sample rate index in program config element does not match the sample rate index configured by the container.\n"); |
d45e44454d13
In the event of a mismatch, do not follow the sample rate index in an AAC PCE.
alexc
parents:
9658
diff
changeset
|
266 |
7501 | 267 num_front = get_bits(gb, 4); |
268 num_side = get_bits(gb, 4); | |
269 num_back = get_bits(gb, 4); | |
270 num_lfe = get_bits(gb, 2); | |
271 num_assoc_data = get_bits(gb, 3); | |
272 num_cc = get_bits(gb, 4); | |
273 | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
274 if (get_bits1(gb)) |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
275 skip_bits(gb, 4); // mono_mixdown_tag |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
276 if (get_bits1(gb)) |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
277 skip_bits(gb, 4); // stereo_mixdown_tag |
7501 | 278 |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
279 if (get_bits1(gb)) |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
280 skip_bits(gb, 3); // mixdown_coeff_index and pseudo_surround |
7501 | 281 |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
282 decode_channel_map(new_che_pos[TYPE_CPE], new_che_pos[TYPE_SCE], AAC_CHANNEL_FRONT, gb, num_front); |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
283 decode_channel_map(new_che_pos[TYPE_CPE], new_che_pos[TYPE_SCE], AAC_CHANNEL_SIDE, gb, num_side ); |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
284 decode_channel_map(new_che_pos[TYPE_CPE], new_che_pos[TYPE_SCE], AAC_CHANNEL_BACK, gb, num_back ); |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
285 decode_channel_map(NULL, new_che_pos[TYPE_LFE], AAC_CHANNEL_LFE, gb, num_lfe ); |
7501 | 286 |
287 skip_bits_long(gb, 4 * num_assoc_data); | |
288 | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
289 decode_channel_map(new_che_pos[TYPE_CCE], new_che_pos[TYPE_CCE], AAC_CHANNEL_CC, gb, num_cc ); |
7501 | 290 |
291 align_get_bits(gb); | |
292 | |
293 /* comment field, first byte is length */ | |
294 skip_bits_long(gb, 8 * get_bits(gb, 8)); | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
295 return 0; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
296 } |
7501 | 297 |
7539 | 298 /** |
299 * Set up channel positions based on a default channel configuration | |
300 * as specified in table 1.17. | |
301 * | |
302 * @param new_che_pos New channel position configuration - we only do something if it differs from the current one. | |
303 * | |
304 * @return Returns error status. 0 - OK, !0 - error | |
305 */ | |
10004 | 306 static int set_default_channel_config(AACContext *ac, |
307 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID], | |
308 int channel_config) | |
7539 | 309 { |
10004 | 310 if (channel_config < 1 || channel_config > 7) { |
7539 | 311 av_log(ac->avccontext, AV_LOG_ERROR, "invalid default channel configuration (%d)\n", |
312 channel_config); | |
313 return -1; | |
314 } | |
315 | |
316 /* default channel configurations: | |
317 * | |
318 * 1ch : front center (mono) | |
319 * 2ch : L + R (stereo) | |
320 * 3ch : front center + L + R | |
321 * 4ch : front center + L + R + back center | |
322 * 5ch : front center + L + R + back stereo | |
323 * 6ch : front center + L + R + back stereo + LFE | |
324 * 7ch : front center + L + R + outer front left + outer front right + back stereo + LFE | |
325 */ | |
326 | |
10004 | 327 if (channel_config != 2) |
7539 | 328 new_che_pos[TYPE_SCE][0] = AAC_CHANNEL_FRONT; // front center (or mono) |
10004 | 329 if (channel_config > 1) |
7539 | 330 new_che_pos[TYPE_CPE][0] = AAC_CHANNEL_FRONT; // L + R (or stereo) |
10004 | 331 if (channel_config == 4) |
7539 | 332 new_che_pos[TYPE_SCE][1] = AAC_CHANNEL_BACK; // back center |
10004 | 333 if (channel_config > 4) |
7539 | 334 new_che_pos[TYPE_CPE][(channel_config == 7) + 1] |
10004 | 335 = AAC_CHANNEL_BACK; // back stereo |
336 if (channel_config > 5) | |
7539 | 337 new_che_pos[TYPE_LFE][0] = AAC_CHANNEL_LFE; // LFE |
10004 | 338 if (channel_config == 7) |
7539 | 339 new_che_pos[TYPE_CPE][1] = AAC_CHANNEL_FRONT; // outer front left + outer front right |
340 | |
341 return 0; | |
342 } | |
343 | |
7578 | 344 /** |
345 * Decode GA "General Audio" specific configuration; reference: table 4.1. | |
346 * | |
347 * @return Returns error status. 0 - OK, !0 - error | |
348 */ | |
10004 | 349 static int decode_ga_specific_config(AACContext *ac, GetBitContext *gb, |
350 int channel_config) | |
351 { | |
7578 | 352 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID]; |
353 int extension_flag, ret; | |
354 | |
10004 | 355 if (get_bits1(gb)) { // frameLengthFlag |
9891
7ad7d4094d1f
Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents:
9847
diff
changeset
|
356 av_log_missing_feature(ac->avccontext, "960/120 MDCT window is", 1); |
7539 | 357 return -1; |
358 } | |
359 | |
360 if (get_bits1(gb)) // dependsOnCoreCoder | |
361 skip_bits(gb, 14); // coreCoderDelay | |
362 extension_flag = get_bits1(gb); | |
363 | |
10004 | 364 if (ac->m4ac.object_type == AOT_AAC_SCALABLE || |
365 ac->m4ac.object_type == AOT_ER_AAC_SCALABLE) | |
7539 | 366 skip_bits(gb, 3); // layerNr |
367 | |
368 memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])); | |
369 if (channel_config == 0) { | |
370 skip_bits(gb, 4); // element_instance_tag | |
10004 | 371 if ((ret = decode_pce(ac, new_che_pos, gb))) |
7539 | 372 return ret; |
373 } else { | |
10004 | 374 if ((ret = set_default_channel_config(ac, new_che_pos, channel_config))) |
7539 | 375 return ret; |
376 } | |
10004 | 377 if ((ret = output_configure(ac, ac->che_pos, new_che_pos, channel_config))) |
7539 | 378 return ret; |
379 | |
380 if (extension_flag) { | |
381 switch (ac->m4ac.object_type) { | |
10004 | 382 case AOT_ER_BSAC: |
383 skip_bits(gb, 5); // numOfSubFrame | |
384 skip_bits(gb, 11); // layer_length | |
385 break; | |
386 case AOT_ER_AAC_LC: | |
387 case AOT_ER_AAC_LTP: | |
388 case AOT_ER_AAC_SCALABLE: | |
389 case AOT_ER_AAC_LD: | |
390 skip_bits(gb, 3); /* aacSectionDataResilienceFlag | |
7539 | 391 * aacScalefactorDataResilienceFlag |
392 * aacSpectralDataResilienceFlag | |
393 */ | |
10004 | 394 break; |
7539 | 395 } |
396 skip_bits1(gb); // extensionFlag3 (TBD in version 3) | |
397 } | |
398 return 0; | |
399 } | |
400 | |
401 /** | |
402 * Decode audio specific configuration; reference: table 1.13. | |
403 * | |
404 * @param data pointer to AVCodecContext extradata | |
405 * @param data_size size of AVCCodecContext extradata | |
406 * | |
407 * @return Returns error status. 0 - OK, !0 - error | |
408 */ | |
10004 | 409 static int decode_audio_specific_config(AACContext *ac, void *data, |
410 int data_size) | |
411 { | |
7539 | 412 GetBitContext gb; |
413 int i; | |
414 | |
415 init_get_bits(&gb, data, data_size * 8); | |
416 | |
10004 | 417 if ((i = ff_mpeg4audio_get_config(&ac->m4ac, data, data_size)) < 0) |
7539 | 418 return -1; |
10004 | 419 if (ac->m4ac.sampling_index > 12) { |
7539 | 420 av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index); |
421 return -1; | |
422 } | |
423 | |
424 skip_bits_long(&gb, i); | |
425 | |
426 switch (ac->m4ac.object_type) { | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
427 case AOT_AAC_MAIN: |
7539 | 428 case AOT_AAC_LC: |
429 if (decode_ga_specific_config(ac, &gb, ac->m4ac.chan_config)) | |
430 return -1; | |
431 break; | |
432 default: | |
433 av_log(ac->avccontext, AV_LOG_ERROR, "Audio object type %s%d is not supported.\n", | |
434 ac->m4ac.sbr == 1? "SBR+" : "", ac->m4ac.object_type); | |
435 return -1; | |
436 } | |
437 return 0; | |
438 } | |
439 | |
7578 | 440 /** |
441 * linear congruential pseudorandom number generator | |
442 * | |
443 * @param previous_val pointer to the current state of the generator | |
444 * | |
445 * @return Returns a 32-bit pseudorandom integer | |
446 */ | |
10004 | 447 static av_always_inline int lcg_random(int previous_val) |
448 { | |
7578 | 449 return previous_val * 1664525 + 1013904223; |
450 } | |
451 | |
10004 | 452 static void reset_predict_state(PredictorState *ps) |
453 { | |
454 ps->r0 = 0.0f; | |
455 ps->r1 = 0.0f; | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
456 ps->cor0 = 0.0f; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
457 ps->cor1 = 0.0f; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
458 ps->var0 = 1.0f; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
459 ps->var1 = 1.0f; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
460 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
461 |
10004 | 462 static void reset_all_predictors(PredictorState *ps) |
463 { | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
464 int i; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
465 for (i = 0; i < MAX_PREDICTORS; i++) |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
466 reset_predict_state(&ps[i]); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
467 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
468 |
10004 | 469 static void reset_predictor_group(PredictorState *ps, int group_num) |
470 { | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
471 int i; |
10004 | 472 for (i = group_num - 1; i < MAX_PREDICTORS; i += 30) |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
473 reset_predict_state(&ps[i]); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
474 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
475 |
10004 | 476 static av_cold int aac_decode_init(AVCodecContext *avccontext) |
477 { | |
478 AACContext *ac = avccontext->priv_data; | |
7501 | 479 int i; |
480 | |
481 ac->avccontext = avccontext; | |
482 | |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
483 if (avccontext->extradata_size > 0) { |
10004 | 484 if (decode_audio_specific_config(ac, avccontext->extradata, avccontext->extradata_size)) |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
485 return -1; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
486 avccontext->sample_rate = ac->m4ac.sample_rate; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
487 } else if (avccontext->channels > 0) { |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
488 ac->m4ac.sample_rate = avccontext->sample_rate; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
489 } |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
490 |
10004 | 491 avccontext->sample_fmt = SAMPLE_FMT_S16; |
492 avccontext->frame_size = 1024; | |
7501 | 493 |
494 AAC_INIT_VLC_STATIC( 0, 144); | |
495 AAC_INIT_VLC_STATIC( 1, 114); | |
496 AAC_INIT_VLC_STATIC( 2, 188); | |
497 AAC_INIT_VLC_STATIC( 3, 180); | |
498 AAC_INIT_VLC_STATIC( 4, 172); | |
499 AAC_INIT_VLC_STATIC( 5, 140); | |
500 AAC_INIT_VLC_STATIC( 6, 168); | |
501 AAC_INIT_VLC_STATIC( 7, 114); | |
502 AAC_INIT_VLC_STATIC( 8, 262); | |
503 AAC_INIT_VLC_STATIC( 9, 248); | |
504 AAC_INIT_VLC_STATIC(10, 384); | |
505 | |
506 dsputil_init(&ac->dsp, avccontext); | |
507 | |
7539 | 508 ac->random_state = 0x1f2e3d4c; |
509 | |
7501 | 510 // -1024 - Compensate wrong IMDCT method. |
511 // 32768 - Required to scale values to the correct range for the bias method | |
512 // for float to int16 conversion. | |
513 | |
10004 | 514 if (ac->dsp.float_to_int16 == ff_float_to_int16_c) { |
515 ac->add_bias = 385.0f; | |
516 ac->sf_scale = 1. / (-1024. * 32768.); | |
7501 | 517 ac->sf_offset = 0; |
518 } else { | |
10004 | 519 ac->add_bias = 0.0f; |
520 ac->sf_scale = 1. / -1024.; | |
7501 | 521 ac->sf_offset = 60; |
522 } | |
523 | |
8590 | 524 #if !CONFIG_HARDCODED_TABLES |
8109
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
525 for (i = 0; i < 428; i++) |
10004 | 526 ff_aac_pow2sf_tab[i] = pow(2, (i - 200) / 4.); |
7501 | 527 #endif /* CONFIG_HARDCODED_TABLES */ |
528 | |
8042 | 529 INIT_VLC_STATIC(&vlc_scalefactors,7,FF_ARRAY_ELEMS(ff_aac_scalefactor_code), |
10004 | 530 ff_aac_scalefactor_bits, sizeof(ff_aac_scalefactor_bits[0]), sizeof(ff_aac_scalefactor_bits[0]), |
531 ff_aac_scalefactor_code, sizeof(ff_aac_scalefactor_code[0]), sizeof(ff_aac_scalefactor_code[0]), | |
532 352); | |
7501 | 533 |
9658
67a20f0eb42c
Support for getting (i)MDCT output multiplied by a constant scaling factor.
serge
parents:
9634
diff
changeset
|
534 ff_mdct_init(&ac->mdct, 11, 1, 1.0); |
67a20f0eb42c
Support for getting (i)MDCT output multiplied by a constant scaling factor.
serge
parents:
9634
diff
changeset
|
535 ff_mdct_init(&ac->mdct_small, 8, 1, 1.0); |
7581 | 536 // window initialization |
537 ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); | |
538 ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); | |
539 ff_sine_window_init(ff_sine_1024, 1024); | |
540 ff_sine_window_init(ff_sine_128, 128); | |
541 | |
7501 | 542 return 0; |
543 } | |
544 | |
7539 | 545 /** |
546 * Skip data_stream_element; reference: table 4.10. | |
547 */ | |
10004 | 548 static void skip_data_stream_element(GetBitContext *gb) |
549 { | |
7501 | 550 int byte_align = get_bits1(gb); |
551 int count = get_bits(gb, 8); | |
552 if (count == 255) | |
553 count += get_bits(gb, 8); | |
554 if (byte_align) | |
555 align_get_bits(gb); | |
556 skip_bits_long(gb, 8 * count); | |
557 } | |
558 | |
10004 | 559 static int decode_prediction(AACContext *ac, IndividualChannelStream *ics, |
560 GetBitContext *gb) | |
561 { | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
562 int sfb; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
563 if (get_bits1(gb)) { |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
564 ics->predictor_reset_group = get_bits(gb, 5); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
565 if (ics->predictor_reset_group == 0 || ics->predictor_reset_group > 30) { |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
566 av_log(ac->avccontext, AV_LOG_ERROR, "Invalid Predictor Reset Group.\n"); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
567 return -1; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
568 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
569 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
570 for (sfb = 0; sfb < FFMIN(ics->max_sfb, ff_aac_pred_sfb_max[ac->m4ac.sampling_index]); sfb++) { |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
571 ics->prediction_used[sfb] = get_bits1(gb); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
572 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
573 return 0; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
574 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
575 |
7501 | 576 /** |
7539 | 577 * Decode Individual Channel Stream info; reference: table 4.6. |
578 * | |
579 * @param common_window Channels have independent [0], or shared [1], Individual Channel Stream information. | |
580 */ | |
10004 | 581 static int decode_ics_info(AACContext *ac, IndividualChannelStream *ics, |
582 GetBitContext *gb, int common_window) | |
583 { | |
7539 | 584 if (get_bits1(gb)) { |
585 av_log(ac->avccontext, AV_LOG_ERROR, "Reserved bit set.\n"); | |
586 memset(ics, 0, sizeof(IndividualChannelStream)); | |
587 return -1; | |
588 } | |
589 ics->window_sequence[1] = ics->window_sequence[0]; | |
590 ics->window_sequence[0] = get_bits(gb, 2); | |
10004 | 591 ics->use_kb_window[1] = ics->use_kb_window[0]; |
592 ics->use_kb_window[0] = get_bits1(gb); | |
593 ics->num_window_groups = 1; | |
594 ics->group_len[0] = 1; | |
7581 | 595 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { |
596 int i; | |
597 ics->max_sfb = get_bits(gb, 4); | |
598 for (i = 0; i < 7; i++) { | |
599 if (get_bits1(gb)) { | |
10004 | 600 ics->group_len[ics->num_window_groups - 1]++; |
7581 | 601 } else { |
602 ics->num_window_groups++; | |
10004 | 603 ics->group_len[ics->num_window_groups - 1] = 1; |
7581 | 604 } |
605 } | |
10004 | 606 ics->num_windows = 8; |
607 ics->swb_offset = ff_swb_offset_128[ac->m4ac.sampling_index]; | |
608 ics->num_swb = ff_aac_num_swb_128[ac->m4ac.sampling_index]; | |
609 ics->tns_max_bands = ff_tns_max_bands_128[ac->m4ac.sampling_index]; | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
610 ics->predictor_present = 0; |
7581 | 611 } else { |
10004 | 612 ics->max_sfb = get_bits(gb, 6); |
613 ics->num_windows = 1; | |
614 ics->swb_offset = ff_swb_offset_1024[ac->m4ac.sampling_index]; | |
615 ics->num_swb = ff_aac_num_swb_1024[ac->m4ac.sampling_index]; | |
616 ics->tns_max_bands = ff_tns_max_bands_1024[ac->m4ac.sampling_index]; | |
617 ics->predictor_present = get_bits1(gb); | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
618 ics->predictor_reset_group = 0; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
619 if (ics->predictor_present) { |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
620 if (ac->m4ac.object_type == AOT_AAC_MAIN) { |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
621 if (decode_prediction(ac, ics, gb)) { |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
622 memset(ics, 0, sizeof(IndividualChannelStream)); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
623 return -1; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
624 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
625 } else if (ac->m4ac.object_type == AOT_AAC_LC) { |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
626 av_log(ac->avccontext, AV_LOG_ERROR, "Prediction is not allowed in AAC-LC.\n"); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
627 memset(ics, 0, sizeof(IndividualChannelStream)); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
628 return -1; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
629 } else { |
9891
7ad7d4094d1f
Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents:
9847
diff
changeset
|
630 av_log_missing_feature(ac->avccontext, "Predictor bit set but LTP is", 1); |
8200 | 631 memset(ics, 0, sizeof(IndividualChannelStream)); |
632 return -1; | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
633 } |
7578 | 634 } |
635 } | |
636 | |
10004 | 637 if (ics->max_sfb > ics->num_swb) { |
7578 | 638 av_log(ac->avccontext, AV_LOG_ERROR, |
10004 | 639 "Number of scalefactor bands in group (%d) exceeds limit (%d).\n", |
640 ics->max_sfb, ics->num_swb); | |
7578 | 641 memset(ics, 0, sizeof(IndividualChannelStream)); |
642 return -1; | |
643 } | |
644 | |
7539 | 645 return 0; |
646 } | |
647 | |
648 /** | |
649 * Decode band types (section_data payload); reference: table 4.46. | |
650 * | |
651 * @param band_type array of the used band type | |
652 * @param band_type_run_end array of the last scalefactor band of a band type run | |
653 * | |
654 * @return Returns error status. 0 - OK, !0 - error | |
655 */ | |
10004 | 656 static int decode_band_types(AACContext *ac, enum BandType band_type[120], |
657 int band_type_run_end[120], GetBitContext *gb, | |
658 IndividualChannelStream *ics) | |
659 { | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
660 int g, idx = 0; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
661 const int bits = (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) ? 3 : 5; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
662 for (g = 0; g < ics->num_window_groups; g++) { |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
663 int k = 0; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
664 while (k < ics->max_sfb) { |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
665 uint8_t sect_len = k; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
666 int sect_len_incr; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
667 int sect_band_type = get_bits(gb, 4); |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
668 if (sect_band_type == 12) { |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
669 av_log(ac->avccontext, AV_LOG_ERROR, "invalid band type\n"); |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
670 return -1; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
671 } |
10004 | 672 while ((sect_len_incr = get_bits(gb, bits)) == (1 << bits) - 1) |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
673 sect_len += sect_len_incr; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
674 sect_len += sect_len_incr; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
675 if (sect_len > ics->max_sfb) { |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
676 av_log(ac->avccontext, AV_LOG_ERROR, |
10004 | 677 "Number of bands (%d) exceeds limit (%d).\n", |
678 sect_len, ics->max_sfb); | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
679 return -1; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
680 } |
7581 | 681 for (; k < sect_len; k++) { |
682 band_type [idx] = sect_band_type; | |
683 band_type_run_end[idx++] = sect_len; | |
684 } | |
7539 | 685 } |
686 } | |
687 return 0; | |
688 } | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
689 |
7539 | 690 /** |
691 * Decode scalefactors; reference: table 4.47. | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
692 * |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
693 * @param global_gain first scalefactor value as scalefactors are differentially coded |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
694 * @param band_type array of the used band type |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
695 * @param band_type_run_end array of the last scalefactor band of a band type run |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
696 * @param sf array of scalefactors or intensity stereo positions |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
697 * |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
698 * @return Returns error status. 0 - OK, !0 - error |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
699 */ |
10004 | 700 static int decode_scalefactors(AACContext *ac, float sf[120], GetBitContext *gb, |
701 unsigned int global_gain, | |
702 IndividualChannelStream *ics, | |
703 enum BandType band_type[120], | |
704 int band_type_run_end[120]) | |
705 { | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
706 const int sf_offset = ac->sf_offset + (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE ? 12 : 0); |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
707 int g, i, idx = 0; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
708 int offset[3] = { global_gain, global_gain - 90, 100 }; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
709 int noise_flag = 1; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
710 static const char *sf_str[3] = { "Global gain", "Noise gain", "Intensity stereo position" }; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
711 for (g = 0; g < ics->num_window_groups; g++) { |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
712 for (i = 0; i < ics->max_sfb;) { |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
713 int run_end = band_type_run_end[idx]; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
714 if (band_type[idx] == ZERO_BT) { |
10004 | 715 for (; i < run_end; i++, idx++) |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
716 sf[idx] = 0.; |
10004 | 717 } else if ((band_type[idx] == INTENSITY_BT) || (band_type[idx] == INTENSITY_BT2)) { |
718 for (; i < run_end; i++, idx++) { | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
719 offset[2] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; |
10004 | 720 if (offset[2] > 255U) { |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
721 av_log(ac->avccontext, AV_LOG_ERROR, |
10004 | 722 "%s (%d) out of range.\n", sf_str[2], offset[2]); |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
723 return -1; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
724 } |
10004 | 725 sf[idx] = ff_aac_pow2sf_tab[-offset[2] + 300]; |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
726 } |
10004 | 727 } else if (band_type[idx] == NOISE_BT) { |
728 for (; i < run_end; i++, idx++) { | |
729 if (noise_flag-- > 0) | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
730 offset[1] += get_bits(gb, 9) - 256; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
731 else |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
732 offset[1] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; |
10004 | 733 if (offset[1] > 255U) { |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
734 av_log(ac->avccontext, AV_LOG_ERROR, |
10004 | 735 "%s (%d) out of range.\n", sf_str[1], offset[1]); |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
736 return -1; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
737 } |
10004 | 738 sf[idx] = -ff_aac_pow2sf_tab[offset[1] + sf_offset + 100]; |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
739 } |
10004 | 740 } else { |
741 for (; i < run_end; i++, idx++) { | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
742 offset[0] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; |
10004 | 743 if (offset[0] > 255U) { |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
744 av_log(ac->avccontext, AV_LOG_ERROR, |
10004 | 745 "%s (%d) out of range.\n", sf_str[0], offset[0]); |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
746 return -1; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
747 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
748 sf[idx] = -ff_aac_pow2sf_tab[ offset[0] + sf_offset]; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
749 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
750 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
751 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
752 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
753 return 0; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
754 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
755 |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
756 /** |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
757 * Decode pulse data; reference: table 4.7. |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
758 */ |
10004 | 759 static int decode_pulses(Pulse *pulse, GetBitContext *gb, |
760 const uint16_t *swb_offset, int num_swb) | |
761 { | |
7871
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
762 int i, pulse_swb; |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
763 pulse->num_pulse = get_bits(gb, 2) + 1; |
7871
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
764 pulse_swb = get_bits(gb, 6); |
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
765 if (pulse_swb >= num_swb) |
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
766 return -1; |
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
767 pulse->pos[0] = swb_offset[pulse_swb]; |
7856
0882c93a0c11
Operands of '+' are not necessarily evaluated in order so r15311 was pointless.
superdump
parents:
7855
diff
changeset
|
768 pulse->pos[0] += get_bits(gb, 5); |
7871
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
769 if (pulse->pos[0] > 1023) |
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
770 return -1; |
7580 | 771 pulse->amp[0] = get_bits(gb, 4); |
772 for (i = 1; i < pulse->num_pulse; i++) { | |
10004 | 773 pulse->pos[i] = get_bits(gb, 5) + pulse->pos[i - 1]; |
7871
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
774 if (pulse->pos[i] > 1023) |
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
775 return -1; |
7580 | 776 pulse->amp[i] = get_bits(gb, 4); |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
777 } |
7871
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
778 return 0; |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
779 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
780 |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
781 /** |
7609 | 782 * Decode Temporal Noise Shaping data; reference: table 4.48. |
783 * | |
784 * @return Returns error status. 0 - OK, !0 - error | |
785 */ | |
10004 | 786 static int decode_tns(AACContext *ac, TemporalNoiseShaping *tns, |
787 GetBitContext *gb, const IndividualChannelStream *ics) | |
788 { | |
7609 | 789 int w, filt, i, coef_len, coef_res, coef_compress; |
790 const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE; | |
791 const int tns_max_order = is8 ? 7 : ac->m4ac.object_type == AOT_AAC_MAIN ? 20 : 12; | |
792 for (w = 0; w < ics->num_windows; w++) { | |
7637
1fd8e319e8b6
Work around GCC variable may be used uninitialised warning
superdump
parents:
7636
diff
changeset
|
793 if ((tns->n_filt[w] = get_bits(gb, 2 - is8))) { |
7609 | 794 coef_res = get_bits1(gb); |
795 | |
7638 | 796 for (filt = 0; filt < tns->n_filt[w]; filt++) { |
797 int tmp2_idx; | |
10004 | 798 tns->length[w][filt] = get_bits(gb, 6 - 2 * is8); |
7609 | 799 |
10004 | 800 if ((tns->order[w][filt] = get_bits(gb, 5 - 2 * is8)) > tns_max_order) { |
7638 | 801 av_log(ac->avccontext, AV_LOG_ERROR, "TNS filter order %d is greater than maximum %d.", |
802 tns->order[w][filt], tns_max_order); | |
803 tns->order[w][filt] = 0; | |
804 return -1; | |
805 } | |
7850
77030651ddd0
Only read some of TNS bitstream data in the case that the TNS filter order is
superdump
parents:
7845
diff
changeset
|
806 if (tns->order[w][filt]) { |
7851 | 807 tns->direction[w][filt] = get_bits1(gb); |
808 coef_compress = get_bits1(gb); | |
809 coef_len = coef_res + 3 - coef_compress; | |
10004 | 810 tmp2_idx = 2 * coef_compress + coef_res; |
7638 | 811 |
7851 | 812 for (i = 0; i < tns->order[w][filt]; i++) |
813 tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)]; | |
7850
77030651ddd0
Only read some of TNS bitstream data in the case that the TNS filter order is
superdump
parents:
7845
diff
changeset
|
814 } |
7609 | 815 } |
7637
1fd8e319e8b6
Work around GCC variable may be used uninitialised warning
superdump
parents:
7636
diff
changeset
|
816 } |
7609 | 817 } |
818 return 0; | |
819 } | |
820 | |
821 /** | |
7539 | 822 * Decode Mid/Side data; reference: table 4.54. |
823 * | |
824 * @param ms_present Indicates mid/side stereo presence. [0] mask is all 0s; | |
825 * [1] mask is decoded from bitstream; [2] mask is all 1s; | |
826 * [3] reserved for scalable AAC | |
827 */ | |
10004 | 828 static void decode_mid_side_stereo(ChannelElement *cpe, GetBitContext *gb, |
829 int ms_present) | |
830 { | |
7578 | 831 int idx; |
832 if (ms_present == 1) { | |
833 for (idx = 0; idx < cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb; idx++) | |
834 cpe->ms_mask[idx] = get_bits1(gb); | |
835 } else if (ms_present == 2) { | |
836 memset(cpe->ms_mask, 1, cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb * sizeof(cpe->ms_mask[0])); | |
837 } | |
838 } | |
7539 | 839 |
840 /** | |
7581 | 841 * Decode spectral data; reference: table 4.50. |
842 * Dequantize and scale spectral data; reference: 4.6.3.3. | |
843 * | |
844 * @param coef array of dequantized, scaled spectral data | |
845 * @param sf array of scalefactors or intensity stereo positions | |
846 * @param pulse_present set if pulses are present | |
847 * @param pulse pointer to pulse data struct | |
848 * @param band_type array of the used band type | |
849 * | |
850 * @return Returns error status. 0 - OK, !0 - error | |
851 */ | |
10004 | 852 static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024], |
853 GetBitContext *gb, float sf[120], | |
854 int pulse_present, const Pulse *pulse, | |
855 const IndividualChannelStream *ics, | |
856 enum BandType band_type[120]) | |
857 { | |
7581 | 858 int i, k, g, idx = 0; |
10004 | 859 const int c = 1024 / ics->num_windows; |
860 const uint16_t *offsets = ics->swb_offset; | |
7581 | 861 float *coef_base = coef; |
8284 | 862 static const float sign_lookup[] = { 1.0f, -1.0f }; |
7581 | 863 |
864 for (g = 0; g < ics->num_windows; g++) | |
10004 | 865 memset(coef + g * 128 + offsets[ics->max_sfb], 0, sizeof(float) * (c - offsets[ics->max_sfb])); |
7581 | 866 |
867 for (g = 0; g < ics->num_window_groups; g++) { | |
868 for (i = 0; i < ics->max_sfb; i++, idx++) { | |
869 const int cur_band_type = band_type[idx]; | |
870 const int dim = cur_band_type >= FIRST_PAIR_BT ? 2 : 4; | |
871 const int is_cb_unsigned = IS_CODEBOOK_UNSIGNED(cur_band_type); | |
872 int group; | |
8413
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
873 if (cur_band_type == ZERO_BT || cur_band_type == INTENSITY_BT2 || cur_band_type == INTENSITY_BT) { |
7581 | 874 for (group = 0; group < ics->group_len[g]; group++) { |
10004 | 875 memset(coef + group * 128 + offsets[i], 0, (offsets[i + 1] - offsets[i]) * sizeof(float)); |
7581 | 876 } |
10004 | 877 } else if (cur_band_type == NOISE_BT) { |
7581 | 878 for (group = 0; group < ics->group_len[g]; group++) { |
8109
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
879 float scale; |
10252 | 880 float band_energy; |
10227 | 881 float *cf = coef + group * 128 + offsets[i]; |
10220 | 882 int len = offsets[i+1] - offsets[i]; |
883 | |
10252 | 884 for (k = 0; k < len; k++) { |
7581 | 885 ac->random_state = lcg_random(ac->random_state); |
10252 | 886 cf[k] = ac->random_state; |
8109
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
887 } |
10220 | 888 |
10252 | 889 band_energy = ac->dsp.scalarproduct_float(cf, cf, len); |
8109
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
890 scale = sf[idx] / sqrtf(band_energy); |
10220 | 891 ac->dsp.vector_fmul_scalar(cf, cf, scale, len); |
7581 | 892 } |
10004 | 893 } else { |
7581 | 894 for (group = 0; group < ics->group_len[g]; group++) { |
10220 | 895 const float *vq[96]; |
896 const float **vqp = vq; | |
897 float *cf = coef + (group << 7) + offsets[i]; | |
898 int len = offsets[i + 1] - offsets[i]; | |
899 | |
10004 | 900 for (k = offsets[i]; k < offsets[i + 1]; k += dim) { |
7581 | 901 const int index = get_vlc2(gb, vlc_spectral[cur_band_type - 1].table, 6, 3); |
902 const int coef_tmp_idx = (group << 7) + k; | |
903 const float *vq_ptr; | |
904 int j; | |
10004 | 905 if (index >= ff_aac_spectral_sizes[cur_band_type - 1]) { |
7581 | 906 av_log(ac->avccontext, AV_LOG_ERROR, |
10004 | 907 "Read beyond end of ff_aac_codebook_vectors[%d][]. index %d >= %d\n", |
908 cur_band_type - 1, index, ff_aac_spectral_sizes[cur_band_type - 1]); | |
7581 | 909 return -1; |
910 } | |
911 vq_ptr = &ff_aac_codebook_vectors[cur_band_type - 1][index * dim]; | |
10220 | 912 *vqp++ = vq_ptr; |
7581 | 913 if (is_cb_unsigned) { |
10004 | 914 if (vq_ptr[0]) |
915 coef[coef_tmp_idx ] = sign_lookup[get_bits1(gb)]; | |
916 if (vq_ptr[1]) | |
917 coef[coef_tmp_idx + 1] = sign_lookup[get_bits1(gb)]; | |
8283
ea8e4095d980
AAC: Unroll code within decode_spectrum_and_dequant(). Gives 12% net speed gain.
superdump
parents:
8282
diff
changeset
|
918 if (dim == 4) { |
10004 | 919 if (vq_ptr[2]) |
920 coef[coef_tmp_idx + 2] = sign_lookup[get_bits1(gb)]; | |
921 if (vq_ptr[3]) | |
922 coef[coef_tmp_idx + 3] = sign_lookup[get_bits1(gb)]; | |
8283
ea8e4095d980
AAC: Unroll code within decode_spectrum_and_dequant(). Gives 12% net speed gain.
superdump
parents:
8282
diff
changeset
|
923 } |
9053 | 924 if (cur_band_type == ESC_BT) { |
925 for (j = 0; j < 2; j++) { | |
926 if (vq_ptr[j] == 64.0f) { | |
927 int n = 4; | |
928 /* The total length of escape_sequence must be < 22 bits according | |
929 to the specification (i.e. max is 11111111110xxxxxxxxxx). */ | |
930 while (get_bits1(gb) && n < 15) n++; | |
10004 | 931 if (n == 15) { |
9053 | 932 av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n"); |
933 return -1; | |
934 } | |
10004 | 935 n = (1 << n) + get_bits(gb, n); |
9053 | 936 coef[coef_tmp_idx + j] *= cbrtf(n) * n; |
10004 | 937 } else |
9053 | 938 coef[coef_tmp_idx + j] *= vq_ptr[j]; |
939 } | |
9052
54973ad4b7cf
Refactor AAC unsigned band type decoding for a modest speedup.
alexc
parents:
9051
diff
changeset
|
940 } |
54973ad4b7cf
Refactor AAC unsigned band type decoding for a modest speedup.
alexc
parents:
9051
diff
changeset
|
941 } |
10220 | 942 } |
943 | |
944 if (is_cb_unsigned && cur_band_type != ESC_BT) { | |
945 ac->dsp.vector_fmul_sv_scalar[dim>>2]( | |
946 cf, cf, vq, sf[idx], len); | |
10222
4ce0bf184aa3
AAC: Simplify some logic from r19956. (The escape codebook is unsigned.)
alexc
parents:
10220
diff
changeset
|
947 } else if (cur_band_type == ESC_BT) { |
10220 | 948 ac->dsp.vector_fmul_scalar(cf, cf, sf[idx], len); |
949 } else { /* !is_cb_unsigned */ | |
950 ac->dsp.sv_fmul_scalar[dim>>2](cf, vq, sf[idx], len); | |
7581 | 951 } |
952 } | |
953 } | |
954 } | |
10004 | 955 coef += ics->group_len[g] << 7; |
7581 | 956 } |
957 | |
958 if (pulse_present) { | |
7857
d7801471cd52
Apply pulses to unscaled coefficients rather than scaled.
superdump
parents:
7856
diff
changeset
|
959 idx = 0; |
10004 | 960 for (i = 0; i < pulse->num_pulse; i++) { |
961 float co = coef_base[ pulse->pos[i] ]; | |
962 while (offsets[idx + 1] <= pulse->pos[i]) | |
7857
d7801471cd52
Apply pulses to unscaled coefficients rather than scaled.
superdump
parents:
7856
diff
changeset
|
963 idx++; |
d7801471cd52
Apply pulses to unscaled coefficients rather than scaled.
superdump
parents:
7856
diff
changeset
|
964 if (band_type[idx] != NOISE_BT && sf[idx]) { |
7858 | 965 float ico = -pulse->amp[i]; |
966 if (co) { | |
967 co /= sf[idx]; | |
968 ico = co / sqrtf(sqrtf(fabsf(co))) + (co > 0 ? -ico : ico); | |
969 } | |
970 coef_base[ pulse->pos[i] ] = cbrtf(fabsf(ico)) * ico * sf[idx]; | |
7857
d7801471cd52
Apply pulses to unscaled coefficients rather than scaled.
superdump
parents:
7856
diff
changeset
|
971 } |
7581 | 972 } |
973 } | |
974 return 0; | |
975 } | |
976 | |
10004 | 977 static av_always_inline float flt16_round(float pf) |
978 { | |
9179
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
979 union float754 tmp; |
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
980 tmp.f = pf; |
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
981 tmp.i = (tmp.i + 0x00008000U) & 0xFFFF0000U; |
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
982 return tmp.f; |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
983 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
984 |
10004 | 985 static av_always_inline float flt16_even(float pf) |
986 { | |
9179
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
987 union float754 tmp; |
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
988 tmp.f = pf; |
10004 | 989 tmp.i = (tmp.i + 0x00007FFFU + (tmp.i & 0x00010000U >> 16)) & 0xFFFF0000U; |
9179
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
990 return tmp.f; |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
991 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
992 |
10004 | 993 static av_always_inline float flt16_trunc(float pf) |
994 { | |
9179
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
995 union float754 pun; |
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
996 pun.f = pf; |
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
997 pun.i &= 0xFFFF0000U; |
4172c9ef331a
AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents:
9151
diff
changeset
|
998 return pun.f; |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
999 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1000 |
10004 | 1001 static void predict(AACContext *ac, PredictorState *ps, float *coef, |
1002 int output_enable) | |
1003 { | |
1004 const float a = 0.953125; // 61.0 / 64 | |
1005 const float alpha = 0.90625; // 29.0 / 32 | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1006 float e0, e1; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1007 float pv; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1008 float k1, k2; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1009 |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1010 k1 = ps->var0 > 1 ? ps->cor0 * flt16_even(a / ps->var0) : 0; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1011 k2 = ps->var1 > 1 ? ps->cor1 * flt16_even(a / ps->var1) : 0; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1012 |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1013 pv = flt16_round(k1 * ps->r0 + k2 * ps->r1); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1014 if (output_enable) |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1015 *coef += pv * ac->sf_scale; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1016 |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1017 e0 = *coef / ac->sf_scale; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1018 e1 = e0 - k1 * ps->r0; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1019 |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1020 ps->cor1 = flt16_trunc(alpha * ps->cor1 + ps->r1 * e1); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1021 ps->var1 = flt16_trunc(alpha * ps->var1 + 0.5 * (ps->r1 * ps->r1 + e1 * e1)); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1022 ps->cor0 = flt16_trunc(alpha * ps->cor0 + ps->r0 * e0); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1023 ps->var0 = flt16_trunc(alpha * ps->var0 + 0.5 * (ps->r0 * ps->r0 + e0 * e0)); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1024 |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1025 ps->r1 = flt16_trunc(a * (ps->r0 - k1 * e0)); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1026 ps->r0 = flt16_trunc(a * e0); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1027 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1028 |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1029 /** |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1030 * Apply AAC-Main style frequency domain prediction. |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1031 */ |
10004 | 1032 static void apply_prediction(AACContext *ac, SingleChannelElement *sce) |
1033 { | |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1034 int sfb, k; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1035 |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1036 if (!sce->ics.predictor_initialized) { |
8413
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1037 reset_all_predictors(sce->predictor_state); |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1038 sce->ics.predictor_initialized = 1; |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1039 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1040 |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1041 if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) { |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1042 for (sfb = 0; sfb < ff_aac_pred_sfb_max[ac->m4ac.sampling_index]; sfb++) { |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1043 for (k = sce->ics.swb_offset[sfb]; k < sce->ics.swb_offset[sfb + 1]; k++) { |
8413
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1044 predict(ac, &sce->predictor_state[k], &sce->coeffs[k], |
10004 | 1045 sce->ics.predictor_present && sce->ics.prediction_used[sfb]); |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1046 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1047 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1048 if (sce->ics.predictor_reset_group) |
8413
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1049 reset_predictor_group(sce->predictor_state, sce->ics.predictor_reset_group); |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1050 } else |
8413
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1051 reset_all_predictors(sce->predictor_state); |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1052 } |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1053 |
7581 | 1054 /** |
7539 | 1055 * Decode an individual_channel_stream payload; reference: table 4.44. |
1056 * | |
1057 * @param common_window Channels have independent [0], or shared [1], Individual Channel Stream information. | |
1058 * @param scale_flag scalable [1] or non-scalable [0] AAC (Unused until scalable AAC is implemented.) | |
1059 * | |
1060 * @return Returns error status. 0 - OK, !0 - error | |
1061 */ | |
10004 | 1062 static int decode_ics(AACContext *ac, SingleChannelElement *sce, |
1063 GetBitContext *gb, int common_window, int scale_flag) | |
1064 { | |
7539 | 1065 Pulse pulse; |
10004 | 1066 TemporalNoiseShaping *tns = &sce->tns; |
1067 IndividualChannelStream *ics = &sce->ics; | |
1068 float *out = sce->coeffs; | |
7539 | 1069 int global_gain, pulse_present = 0; |
1070 | |
7580 | 1071 /* This assignment is to silence a GCC warning about the variable being used |
1072 * uninitialized when in fact it always is. | |
7539 | 1073 */ |
1074 pulse.num_pulse = 0; | |
1075 | |
1076 global_gain = get_bits(gb, 8); | |
1077 | |
1078 if (!common_window && !scale_flag) { | |
1079 if (decode_ics_info(ac, ics, gb, 0) < 0) | |
1080 return -1; | |
1081 } | |
1082 | |
1083 if (decode_band_types(ac, sce->band_type, sce->band_type_run_end, gb, ics) < 0) | |
1084 return -1; | |
1085 if (decode_scalefactors(ac, sce->sf, gb, global_gain, ics, sce->band_type, sce->band_type_run_end) < 0) | |
1086 return -1; | |
1087 | |
1088 pulse_present = 0; | |
1089 if (!scale_flag) { | |
1090 if ((pulse_present = get_bits1(gb))) { | |
1091 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { | |
1092 av_log(ac->avccontext, AV_LOG_ERROR, "Pulse tool not allowed in eight short sequence.\n"); | |
1093 return -1; | |
1094 } | |
7871
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
1095 if (decode_pulses(&pulse, gb, ics->swb_offset, ics->num_swb)) { |
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
1096 av_log(ac->avccontext, AV_LOG_ERROR, "Pulse data corrupt or invalid.\n"); |
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
1097 return -1; |
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
1098 } |
7539 | 1099 } |
1100 if ((tns->present = get_bits1(gb)) && decode_tns(ac, tns, gb, ics)) | |
1101 return -1; | |
1102 if (get_bits1(gb)) { | |
9891
7ad7d4094d1f
Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents:
9847
diff
changeset
|
1103 av_log_missing_feature(ac->avccontext, "SSR", 1); |
7539 | 1104 return -1; |
1105 } | |
1106 } | |
1107 | |
7580 | 1108 if (decode_spectrum_and_dequant(ac, out, gb, sce->sf, pulse_present, &pulse, ics, sce->band_type) < 0) |
7539 | 1109 return -1; |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1110 |
10004 | 1111 if (ac->m4ac.object_type == AOT_AAC_MAIN && !common_window) |
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1112 apply_prediction(ac, sce); |
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
1113 |
7539 | 1114 return 0; |
1115 } | |
1116 | |
1117 /** | |
7581 | 1118 * Mid/Side stereo decoding; reference: 4.6.8.1.3. |
1119 */ | |
10220 | 1120 static void apply_mid_side_stereo(AACContext *ac, ChannelElement *cpe) |
10004 | 1121 { |
1122 const IndividualChannelStream *ics = &cpe->ch[0].ics; | |
7581 | 1123 float *ch0 = cpe->ch[0].coeffs; |
1124 float *ch1 = cpe->ch[1].coeffs; | |
10220 | 1125 int g, i, group, idx = 0; |
10004 | 1126 const uint16_t *offsets = ics->swb_offset; |
7581 | 1127 for (g = 0; g < ics->num_window_groups; g++) { |
1128 for (i = 0; i < ics->max_sfb; i++, idx++) { | |
1129 if (cpe->ms_mask[idx] && | |
10004 | 1130 cpe->ch[0].band_type[idx] < NOISE_BT && cpe->ch[1].band_type[idx] < NOISE_BT) { |
7581 | 1131 for (group = 0; group < ics->group_len[g]; group++) { |
10220 | 1132 ac->dsp.butterflies_float(ch0 + group * 128 + offsets[i], |
1133 ch1 + group * 128 + offsets[i], | |
1134 offsets[i+1] - offsets[i]); | |
7581 | 1135 } |
1136 } | |
1137 } | |
10004 | 1138 ch0 += ics->group_len[g] * 128; |
1139 ch1 += ics->group_len[g] * 128; | |
7581 | 1140 } |
1141 } | |
1142 | |
1143 /** | |
1144 * intensity stereo decoding; reference: 4.6.8.2.3 | |
1145 * | |
1146 * @param ms_present Indicates mid/side stereo presence. [0] mask is all 0s; | |
1147 * [1] mask is decoded from bitstream; [2] mask is all 1s; | |
1148 * [3] reserved for scalable AAC | |
1149 */ | |
10004 | 1150 static void apply_intensity_stereo(ChannelElement *cpe, int ms_present) |
1151 { | |
1152 const IndividualChannelStream *ics = &cpe->ch[1].ics; | |
1153 SingleChannelElement *sce1 = &cpe->ch[1]; | |
7581 | 1154 float *coef0 = cpe->ch[0].coeffs, *coef1 = cpe->ch[1].coeffs; |
10004 | 1155 const uint16_t *offsets = ics->swb_offset; |
7581 | 1156 int g, group, i, k, idx = 0; |
1157 int c; | |
1158 float scale; | |
1159 for (g = 0; g < ics->num_window_groups; g++) { | |
1160 for (i = 0; i < ics->max_sfb;) { | |
1161 if (sce1->band_type[idx] == INTENSITY_BT || sce1->band_type[idx] == INTENSITY_BT2) { | |
1162 const int bt_run_end = sce1->band_type_run_end[idx]; | |
1163 for (; i < bt_run_end; i++, idx++) { | |
1164 c = -1 + 2 * (sce1->band_type[idx] - 14); | |
1165 if (ms_present) | |
1166 c *= 1 - 2 * cpe->ms_mask[idx]; | |
1167 scale = c * sce1->sf[idx]; | |
1168 for (group = 0; group < ics->group_len[g]; group++) | |
10004 | 1169 for (k = offsets[i]; k < offsets[i + 1]; k++) |
1170 coef1[group * 128 + k] = scale * coef0[group * 128 + k]; | |
7581 | 1171 } |
1172 } else { | |
1173 int bt_run_end = sce1->band_type_run_end[idx]; | |
1174 idx += bt_run_end - i; | |
1175 i = bt_run_end; | |
1176 } | |
1177 } | |
10004 | 1178 coef0 += ics->group_len[g] * 128; |
1179 coef1 += ics->group_len[g] * 128; | |
7581 | 1180 } |
1181 } | |
1182 | |
1183 /** | |
7539 | 1184 * Decode a channel_pair_element; reference: table 4.4. |
1185 * | |
1186 * @param elem_id Identifies the instance of a syntax element. | |
1187 * | |
1188 * @return Returns error status. 0 - OK, !0 - error | |
1189 */ | |
10004 | 1190 static int decode_cpe(AACContext *ac, GetBitContext *gb, ChannelElement *cpe) |
1191 { | |
7539 | 1192 int i, ret, common_window, ms_present = 0; |
1193 | |
1194 common_window = get_bits1(gb); | |
1195 if (common_window) { | |
1196 if (decode_ics_info(ac, &cpe->ch[0].ics, gb, 1)) | |
1197 return -1; | |
1198 i = cpe->ch[1].ics.use_kb_window[0]; | |
1199 cpe->ch[1].ics = cpe->ch[0].ics; | |
1200 cpe->ch[1].ics.use_kb_window[1] = i; | |
1201 ms_present = get_bits(gb, 2); | |
10004 | 1202 if (ms_present == 3) { |
7539 | 1203 av_log(ac->avccontext, AV_LOG_ERROR, "ms_present = 3 is reserved.\n"); |
1204 return -1; | |
10004 | 1205 } else if (ms_present) |
7539 | 1206 decode_mid_side_stereo(cpe, gb, ms_present); |
1207 } | |
1208 if ((ret = decode_ics(ac, &cpe->ch[0], gb, common_window, 0))) | |
1209 return ret; | |
1210 if ((ret = decode_ics(ac, &cpe->ch[1], gb, common_window, 0))) | |
1211 return ret; | |
1212 | |
8413
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1213 if (common_window) { |
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1214 if (ms_present) |
10220 | 1215 apply_mid_side_stereo(ac, cpe); |
8413
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1216 if (ac->m4ac.object_type == AOT_AAC_MAIN) { |
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1217 apply_prediction(ac, &cpe->ch[0]); |
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1218 apply_prediction(ac, &cpe->ch[1]); |
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1219 } |
6f40f7d77263
AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents:
8412
diff
changeset
|
1220 } |
7539 | 1221 |
7580 | 1222 apply_intensity_stereo(cpe, ms_present); |
7539 | 1223 return 0; |
1224 } | |
1225 | |
7581 | 1226 /** |
1227 * Decode coupling_channel_element; reference: table 4.8. | |
1228 * | |
1229 * @param elem_id Identifies the instance of a syntax element. | |
1230 * | |
1231 * @return Returns error status. 0 - OK, !0 - error | |
1232 */ | |
10004 | 1233 static int decode_cce(AACContext *ac, GetBitContext *gb, ChannelElement *che) |
1234 { | |
7581 | 1235 int num_gain = 0; |
7891
13ee9bb85721
Zero 'idx' for each iteration of the coupling gain loop and as it is only used
superdump
parents:
7890
diff
changeset
|
1236 int c, g, sfb, ret; |
7581 | 1237 int sign; |
1238 float scale; | |
10004 | 1239 SingleChannelElement *sce = &che->ch[0]; |
1240 ChannelCoupling *coup = &che->coup; | |
7581 | 1241 |
10004 | 1242 coup->coupling_point = 2 * get_bits1(gb); |
7578 | 1243 coup->num_coupled = get_bits(gb, 3); |
1244 for (c = 0; c <= coup->num_coupled; c++) { | |
1245 num_gain++; | |
1246 coup->type[c] = get_bits1(gb) ? TYPE_CPE : TYPE_SCE; | |
1247 coup->id_select[c] = get_bits(gb, 4); | |
1248 if (coup->type[c] == TYPE_CPE) { | |
1249 coup->ch_select[c] = get_bits(gb, 2); | |
1250 if (coup->ch_select[c] == 3) | |
1251 num_gain++; | |
1252 } else | |
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1253 coup->ch_select[c] = 2; |
7578 | 1254 } |
10004 | 1255 coup->coupling_point += get_bits1(gb) || (coup->coupling_point >> 1); |
7578 | 1256 |
10004 | 1257 sign = get_bits(gb, 1); |
7889
fdd3e68dcf94
Cast the return value of get_bits() to signed integer such that the subtraction
superdump
parents:
7871
diff
changeset
|
1258 scale = pow(2., pow(2., (int)get_bits(gb, 2) - 3)); |
7578 | 1259 |
1260 if ((ret = decode_ics(ac, sce, gb, 0, 0))) | |
1261 return ret; | |
1262 | |
1263 for (c = 0; c < num_gain; c++) { | |
10004 | 1264 int idx = 0; |
1265 int cge = 1; | |
7578 | 1266 int gain = 0; |
1267 float gain_cache = 1.; | |
1268 if (c) { | |
1269 cge = coup->coupling_point == AFTER_IMDCT ? 1 : get_bits1(gb); | |
1270 gain = cge ? get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60: 0; | |
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1271 gain_cache = pow(scale, -gain); |
7578 | 1272 } |
8822
01271e32d74e
Make set coup.gain[c][0] aand only coup.gain[c][0] is set for a independently switched CCE.
alexc
parents:
8814
diff
changeset
|
1273 if (coup->coupling_point == AFTER_IMDCT) { |
01271e32d74e
Make set coup.gain[c][0] aand only coup.gain[c][0] is set for a independently switched CCE.
alexc
parents:
8814
diff
changeset
|
1274 coup->gain[c][0] = gain_cache; |
01271e32d74e
Make set coup.gain[c][0] aand only coup.gain[c][0] is set for a independently switched CCE.
alexc
parents:
8814
diff
changeset
|
1275 } else { |
8823 | 1276 for (g = 0; g < sce->ics.num_window_groups; g++) { |
1277 for (sfb = 0; sfb < sce->ics.max_sfb; sfb++, idx++) { | |
1278 if (sce->band_type[idx] != ZERO_BT) { | |
1279 if (!cge) { | |
1280 int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; | |
10004 | 1281 if (t) { |
8823 | 1282 int s = 1; |
1283 t = gain += t; | |
1284 if (sign) { | |
1285 s -= 2 * (t & 0x1); | |
1286 t >>= 1; | |
1287 } | |
1288 gain_cache = pow(scale, -t) * s; | |
7578 | 1289 } |
1290 } | |
8823 | 1291 coup->gain[c][idx] = gain_cache; |
7578 | 1292 } |
1293 } | |
7890 | 1294 } |
1295 } | |
7578 | 1296 } |
1297 return 0; | |
1298 } | |
1299 | |
7539 | 1300 /** |
1301 * Decode Spectral Band Replication extension data; reference: table 4.55. | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1302 * |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1303 * @param crc flag indicating the presence of CRC checksum |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1304 * @param cnt length of TYPE_FIL syntactic element in bytes |
7539 | 1305 * |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1306 * @return Returns number of bytes consumed from the TYPE_FIL element. |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1307 */ |
10004 | 1308 static int decode_sbr_extension(AACContext *ac, GetBitContext *gb, |
1309 int crc, int cnt) | |
1310 { | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1311 // TODO : sbr_extension implementation |
9891
7ad7d4094d1f
Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents:
9847
diff
changeset
|
1312 av_log_missing_feature(ac->avccontext, "SBR", 0); |
10004 | 1313 skip_bits_long(gb, 8 * cnt - 4); // -4 due to reading extension type |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1314 return cnt; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1315 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1316 |
7539 | 1317 /** |
7578 | 1318 * Parse whether channels are to be excluded from Dynamic Range Compression; reference: table 4.53. |
1319 * | |
1320 * @return Returns number of bytes consumed. | |
1321 */ | |
10004 | 1322 static int decode_drc_channel_exclusions(DynamicRangeControl *che_drc, |
1323 GetBitContext *gb) | |
1324 { | |
7578 | 1325 int i; |
1326 int num_excl_chan = 0; | |
1327 | |
1328 do { | |
1329 for (i = 0; i < 7; i++) | |
1330 che_drc->exclude_mask[num_excl_chan++] = get_bits1(gb); | |
1331 } while (num_excl_chan < MAX_CHANNELS - 7 && get_bits1(gb)); | |
1332 | |
1333 return num_excl_chan / 7; | |
1334 } | |
1335 | |
1336 /** | |
7539 | 1337 * Decode dynamic range information; reference: table 4.52. |
1338 * | |
1339 * @param cnt length of TYPE_FIL syntactic element in bytes | |
1340 * | |
1341 * @return Returns number of bytes consumed. | |
1342 */ | |
10004 | 1343 static int decode_dynamic_range(DynamicRangeControl *che_drc, |
1344 GetBitContext *gb, int cnt) | |
1345 { | |
1346 int n = 1; | |
7539 | 1347 int drc_num_bands = 1; |
1348 int i; | |
1349 | |
1350 /* pce_tag_present? */ | |
10004 | 1351 if (get_bits1(gb)) { |
7539 | 1352 che_drc->pce_instance_tag = get_bits(gb, 4); |
1353 skip_bits(gb, 4); // tag_reserved_bits | |
1354 n++; | |
1355 } | |
1356 | |
1357 /* excluded_chns_present? */ | |
10004 | 1358 if (get_bits1(gb)) { |
7539 | 1359 n += decode_drc_channel_exclusions(che_drc, gb); |
1360 } | |
1361 | |
1362 /* drc_bands_present? */ | |
1363 if (get_bits1(gb)) { | |
1364 che_drc->band_incr = get_bits(gb, 4); | |
1365 che_drc->interpolation_scheme = get_bits(gb, 4); | |
1366 n++; | |
1367 drc_num_bands += che_drc->band_incr; | |
1368 for (i = 0; i < drc_num_bands; i++) { | |
1369 che_drc->band_top[i] = get_bits(gb, 8); | |
1370 n++; | |
1371 } | |
1372 } | |
1373 | |
1374 /* prog_ref_level_present? */ | |
1375 if (get_bits1(gb)) { | |
1376 che_drc->prog_ref_level = get_bits(gb, 7); | |
1377 skip_bits1(gb); // prog_ref_level_reserved_bits | |
1378 n++; | |
1379 } | |
1380 | |
1381 for (i = 0; i < drc_num_bands; i++) { | |
1382 che_drc->dyn_rng_sgn[i] = get_bits1(gb); | |
1383 che_drc->dyn_rng_ctl[i] = get_bits(gb, 7); | |
1384 n++; | |
1385 } | |
1386 | |
1387 return n; | |
1388 } | |
1389 | |
1390 /** | |
1391 * Decode extension data (incomplete); reference: table 4.51. | |
1392 * | |
1393 * @param cnt length of TYPE_FIL syntactic element in bytes | |
1394 * | |
1395 * @return Returns number of bytes consumed | |
1396 */ | |
10004 | 1397 static int decode_extension_payload(AACContext *ac, GetBitContext *gb, int cnt) |
1398 { | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1399 int crc_flag = 0; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1400 int res = cnt; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1401 switch (get_bits(gb, 4)) { // extension type |
10004 | 1402 case EXT_SBR_DATA_CRC: |
1403 crc_flag++; | |
1404 case EXT_SBR_DATA: | |
1405 res = decode_sbr_extension(ac, gb, crc_flag, cnt); | |
1406 break; | |
1407 case EXT_DYNAMIC_RANGE: | |
1408 res = decode_dynamic_range(&ac->che_drc, gb, cnt); | |
1409 break; | |
1410 case EXT_FILL: | |
1411 case EXT_FILL_DATA: | |
1412 case EXT_DATA_ELEMENT: | |
1413 default: | |
1414 skip_bits_long(gb, 8 * cnt - 4); | |
1415 break; | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1416 }; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1417 return res; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1418 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1419 |
7632
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1420 /** |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1421 * Decode Temporal Noise Shaping filter coefficients and apply all-pole filters; reference: 4.6.9.3. |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1422 * |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1423 * @param decode 1 if tool is used normally, 0 if tool is used in LTP. |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1424 * @param coef spectral coefficients |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1425 */ |
10004 | 1426 static void apply_tns(float coef[1024], TemporalNoiseShaping *tns, |
1427 IndividualChannelStream *ics, int decode) | |
1428 { | |
1429 const int mmm = FFMIN(ics->tns_max_bands, ics->max_sfb); | |
7636 | 1430 int w, filt, m, i; |
7632
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1431 int bottom, top, order, start, end, size, inc; |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1432 float lpc[TNS_MAX_ORDER]; |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1433 |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1434 for (w = 0; w < ics->num_windows; w++) { |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1435 bottom = ics->num_swb; |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1436 for (filt = 0; filt < tns->n_filt[w]; filt++) { |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1437 top = bottom; |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1438 bottom = FFMAX(0, top - tns->length[w][filt]); |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1439 order = tns->order[w][filt]; |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1440 if (order == 0) |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1441 continue; |
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1442 |
7788
ffd4b1364b62
Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
vitor
parents:
7733
diff
changeset
|
1443 // tns_decode_coef |
ffd4b1364b62
Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
vitor
parents:
7733
diff
changeset
|
1444 compute_lpc_coefs(tns->coef[w][filt], order, lpc, 0, 0, 0); |
7632
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1445 |
7609 | 1446 start = ics->swb_offset[FFMIN(bottom, mmm)]; |
1447 end = ics->swb_offset[FFMIN( top, mmm)]; | |
1448 if ((size = end - start) <= 0) | |
1449 continue; | |
1450 if (tns->direction[w][filt]) { | |
10004 | 1451 inc = -1; |
1452 start = end - 1; | |
7609 | 1453 } else { |
1454 inc = 1; | |
1455 } | |
1456 start += w * 128; | |
1457 | |
1458 // ar filter | |
1459 for (m = 0; m < size; m++, start += inc) | |
1460 for (i = 1; i <= FFMIN(m, order); i++) | |
10004 | 1461 coef[start] -= coef[start - i * inc] * lpc[i - 1]; |
7609 | 1462 } |
1463 } | |
1464 } | |
1465 | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1466 /** |
7539 | 1467 * Conduct IMDCT and windowing. |
1468 */ | |
10004 | 1469 static void imdct_and_windowing(AACContext *ac, SingleChannelElement *sce) |
1470 { | |
1471 IndividualChannelStream *ics = &sce->ics; | |
1472 float *in = sce->coeffs; | |
1473 float *out = sce->ret; | |
1474 float *saved = sce->saved; | |
1475 const float *swindow = ics->use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128; | |
1476 const float *lwindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_long_1024 : ff_sine_1024; | |
1477 const float *swindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; | |
1478 float *buf = ac->buf_mdct; | |
1479 float *temp = ac->temp; | |
7539 | 1480 int i; |
1481 | |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1482 // imdct |
7578 | 1483 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { |
1484 if (ics->window_sequence[1] == ONLY_LONG_SEQUENCE || ics->window_sequence[1] == LONG_STOP_SEQUENCE) | |
1485 av_log(ac->avccontext, AV_LOG_WARNING, | |
1486 "Transition from an ONLY_LONG or LONG_STOP to an EIGHT_SHORT sequence detected. " | |
1487 "If you heard an audible artifact, please submit the sample to the FFmpeg developers.\n"); | |
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1488 for (i = 0; i < 1024; i += 128) |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1489 ff_imdct_half(&ac->mdct_small, buf + i, in + i); |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1490 } else |
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1491 ff_imdct_half(&ac->mdct, buf, in); |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1492 |
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1493 /* window overlapping |
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1494 * NOTE: To simplify the overlapping code, all 'meaningless' short to long |
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1495 * and long to short transitions are considered to be short to short |
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1496 * transitions. This leaves just two cases (long to long and short to short) |
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1497 * with a little special sauce for EIGHT_SHORT_SEQUENCE. |
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1498 */ |
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1499 if ((ics->window_sequence[1] == ONLY_LONG_SEQUENCE || ics->window_sequence[1] == LONG_STOP_SEQUENCE) && |
10004 | 1500 (ics->window_sequence[0] == ONLY_LONG_SEQUENCE || ics->window_sequence[0] == LONG_START_SEQUENCE)) { |
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1501 ac->dsp.vector_fmul_window( out, saved, buf, lwindow_prev, ac->add_bias, 512); |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1502 } else { |
7662 | 1503 for (i = 0; i < 448; i++) |
1504 out[i] = saved[i] + ac->add_bias; | |
7578 | 1505 |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1506 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { |
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1507 ac->dsp.vector_fmul_window(out + 448 + 0*128, saved + 448, buf + 0*128, swindow_prev, ac->add_bias, 64); |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1508 ac->dsp.vector_fmul_window(out + 448 + 1*128, buf + 0*128 + 64, buf + 1*128, swindow, ac->add_bias, 64); |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1509 ac->dsp.vector_fmul_window(out + 448 + 2*128, buf + 1*128 + 64, buf + 2*128, swindow, ac->add_bias, 64); |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1510 ac->dsp.vector_fmul_window(out + 448 + 3*128, buf + 2*128 + 64, buf + 3*128, swindow, ac->add_bias, 64); |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1511 ac->dsp.vector_fmul_window(temp, buf + 3*128 + 64, buf + 4*128, swindow, ac->add_bias, 64); |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1512 memcpy( out + 448 + 4*128, temp, 64 * sizeof(float)); |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1513 } else { |
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1514 ac->dsp.vector_fmul_window(out + 448, saved + 448, buf, swindow_prev, ac->add_bias, 64); |
7662 | 1515 for (i = 576; i < 1024; i++) |
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1516 out[i] = buf[i-512] + ac->add_bias; |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1517 } |
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1518 } |
7578 | 1519 |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1520 // buffer update |
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1521 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { |
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1522 for (i = 0; i < 64; i++) |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1523 saved[i] = temp[64 + i] - ac->add_bias; |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1524 ac->dsp.vector_fmul_window(saved + 64, buf + 4*128 + 64, buf + 5*128, swindow, 0, 64); |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1525 ac->dsp.vector_fmul_window(saved + 192, buf + 5*128 + 64, buf + 6*128, swindow, 0, 64); |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1526 ac->dsp.vector_fmul_window(saved + 320, buf + 6*128 + 64, buf + 7*128, swindow, 0, 64); |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1527 memcpy( saved + 448, buf + 7*128 + 64, 64 * sizeof(float)); |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1528 } else if (ics->window_sequence[0] == LONG_START_SEQUENCE) { |
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1529 memcpy( saved, buf + 512, 448 * sizeof(float)); |
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1530 memcpy( saved + 448, buf + 7*128 + 64, 64 * sizeof(float)); |
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1531 } else { // LONG_STOP or ONLY_LONG |
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1532 memcpy( saved, buf + 512, 512 * sizeof(float)); |
7578 | 1533 } |
1534 } | |
1535 | |
7539 | 1536 /** |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1537 * Apply dependent channel coupling (applied before IMDCT). |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1538 * |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1539 * @param index index into coupling gain array |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1540 */ |
10004 | 1541 static void apply_dependent_coupling(AACContext *ac, |
1542 SingleChannelElement *target, | |
1543 ChannelElement *cce, int index) | |
1544 { | |
1545 IndividualChannelStream *ics = &cce->ch[0].ics; | |
1546 const uint16_t *offsets = ics->swb_offset; | |
1547 float *dest = target->coeffs; | |
1548 const float *src = cce->ch[0].coeffs; | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1549 int g, i, group, k, idx = 0; |
10004 | 1550 if (ac->m4ac.object_type == AOT_AAC_LTP) { |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1551 av_log(ac->avccontext, AV_LOG_ERROR, |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1552 "Dependent coupling is not supported together with LTP\n"); |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1553 return; |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1554 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1555 for (g = 0; g < ics->num_window_groups; g++) { |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1556 for (i = 0; i < ics->max_sfb; i++, idx++) { |
8006
c7c1e85d14bc
Rename variables to clarify the channel coupling element and corresponding
superdump
parents:
8004
diff
changeset
|
1557 if (cce->ch[0].band_type[idx] != ZERO_BT) { |
9143 | 1558 const float gain = cce->coup.gain[index][idx]; |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1559 for (group = 0; group < ics->group_len[g]; group++) { |
10004 | 1560 for (k = offsets[i]; k < offsets[i + 1]; k++) { |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1561 // XXX dsputil-ize |
10004 | 1562 dest[group * 128 + k] += gain * src[group * 128 + k]; |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1563 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1564 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1565 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1566 } |
10004 | 1567 dest += ics->group_len[g] * 128; |
1568 src += ics->group_len[g] * 128; | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1569 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1570 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1571 |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1572 /** |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1573 * Apply independent channel coupling (applied after IMDCT). |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1574 * |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1575 * @param index index into coupling gain array |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1576 */ |
10004 | 1577 static void apply_independent_coupling(AACContext *ac, |
1578 SingleChannelElement *target, | |
1579 ChannelElement *cce, int index) | |
1580 { | |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1581 int i; |
9051
0cffed11ee33
Use const to better allow the compiler to optimize AAC independent coupling.
alexc
parents:
8823
diff
changeset
|
1582 const float gain = cce->coup.gain[index][0]; |
0cffed11ee33
Use const to better allow the compiler to optimize AAC independent coupling.
alexc
parents:
8823
diff
changeset
|
1583 const float bias = ac->add_bias; |
10004 | 1584 const float *src = cce->ch[0].ret; |
1585 float *dest = target->ret; | |
9051
0cffed11ee33
Use const to better allow the compiler to optimize AAC independent coupling.
alexc
parents:
8823
diff
changeset
|
1586 |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1587 for (i = 0; i < 1024; i++) |
9051
0cffed11ee33
Use const to better allow the compiler to optimize AAC independent coupling.
alexc
parents:
8823
diff
changeset
|
1588 dest[i] += gain * (src[i] - bias); |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1589 } |
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1590 |
7581 | 1591 /** |
1592 * channel coupling transformation interface | |
1593 * | |
1594 * @param index index into coupling gain array | |
1595 * @param apply_coupling_method pointer to (in)dependent coupling function | |
1596 */ | |
10004 | 1597 static void apply_channel_coupling(AACContext *ac, ChannelElement *cc, |
1598 enum RawDataBlockType type, int elem_id, | |
1599 enum CouplingPoint coupling_point, | |
1600 void (*apply_coupling_method)(AACContext *ac, SingleChannelElement *target, ChannelElement *cce, int index)) | |
7581 | 1601 { |
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1602 int i, c; |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1603 |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1604 for (i = 0; i < MAX_ELEM_ID; i++) { |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1605 ChannelElement *cce = ac->che[TYPE_CCE][i]; |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1606 int index = 0; |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1607 |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1608 if (cce && cce->coup.coupling_point == coupling_point) { |
10004 | 1609 ChannelCoupling *coup = &cce->coup; |
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1610 |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1611 for (c = 0; c <= coup->num_coupled; c++) { |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1612 if (coup->type[c] == type && coup->id_select[c] == elem_id) { |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1613 if (coup->ch_select[c] != 1) { |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1614 apply_coupling_method(ac, &cc->ch[0], cce, index); |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1615 if (coup->ch_select[c] != 0) |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1616 index++; |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1617 } |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1618 if (coup->ch_select[c] != 2) |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1619 apply_coupling_method(ac, &cc->ch[1], cce, index++); |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1620 } else |
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1621 index += 1 + (coup->ch_select[c] == 3); |
7581 | 1622 } |
1623 } | |
1624 } | |
1625 } | |
1626 | |
1627 /** | |
1628 * Convert spectral data to float samples, applying all supported tools as appropriate. | |
1629 */ | |
10004 | 1630 static void spectral_to_sample(AACContext *ac) |
1631 { | |
8502 | 1632 int i, type; |
10004 | 1633 for (type = 3; type >= 0; type--) { |
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1634 for (i = 0; i < MAX_ELEM_ID; i++) { |
7581 | 1635 ChannelElement *che = ac->che[type][i]; |
10004 | 1636 if (che) { |
1637 if (type <= TYPE_CPE) | |
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1638 apply_channel_coupling(ac, che, type, i, BEFORE_TNS, apply_dependent_coupling); |
10004 | 1639 if (che->ch[0].tns.present) |
7581 | 1640 apply_tns(che->ch[0].coeffs, &che->ch[0].tns, &che->ch[0].ics, 1); |
10004 | 1641 if (che->ch[1].tns.present) |
7581 | 1642 apply_tns(che->ch[1].coeffs, &che->ch[1].tns, &che->ch[1].ics, 1); |
10004 | 1643 if (type <= TYPE_CPE) |
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1644 apply_channel_coupling(ac, che, type, i, BETWEEN_TNS_AND_IMDCT, apply_dependent_coupling); |
10004 | 1645 if (type != TYPE_CCE || che->coup.coupling_point == AFTER_IMDCT) |
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1646 imdct_and_windowing(ac, &che->ch[0]); |
10004 | 1647 if (type == TYPE_CPE) |
7581 | 1648 imdct_and_windowing(ac, &che->ch[1]); |
10004 | 1649 if (type <= TYPE_CCE) |
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1650 apply_channel_coupling(ac, che, type, i, AFTER_IMDCT, apply_independent_coupling); |
7578 | 1651 } |
1652 } | |
1653 } | |
1654 } | |
1655 | |
10004 | 1656 static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) |
1657 { | |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1658 int size; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1659 AACADTSHeaderInfo hdr_info; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1660 |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1661 size = ff_aac_parse_header(gb, &hdr_info); |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1662 if (size > 0) { |
9948
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1663 if (!ac->output_configured && hdr_info.chan_config) { |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1664 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID]; |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1665 memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])); |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1666 ac->m4ac.chan_config = hdr_info.chan_config; |
9948
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1667 if (set_default_channel_config(ac, new_che_pos, hdr_info.chan_config)) |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1668 return -7; |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1669 if (output_configure(ac, ac->che_pos, new_che_pos, 1)) |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1670 return -7; |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1671 } |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1672 ac->m4ac.sample_rate = hdr_info.sample_rate; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1673 ac->m4ac.sampling_index = hdr_info.sampling_index; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1674 ac->m4ac.object_type = hdr_info.object_type; |
9151 | 1675 if (hdr_info.num_aac_frames == 1) { |
1676 if (!hdr_info.crc_absent) | |
1677 skip_bits(gb, 16); | |
1678 } else { | |
9891
7ad7d4094d1f
Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents:
9847
diff
changeset
|
1679 av_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0); |
9151 | 1680 return -1; |
1681 } | |
9150
4fe6dee5f1dd
If we get an error from ff_aac_parse_header() we should not trust the header info that it provides.
alexc
parents:
9149
diff
changeset
|
1682 } |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1683 return size; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1684 } |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1685 |
10004 | 1686 static int aac_decode_frame(AVCodecContext *avccontext, void *data, |
1687 int *data_size, AVPacket *avpkt) | |
1688 { | |
9355
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9251
diff
changeset
|
1689 const uint8_t *buf = avpkt->data; |
54bc8a2727b0
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents:
9251
diff
changeset
|
1690 int buf_size = avpkt->size; |
10004 | 1691 AACContext *ac = avccontext->priv_data; |
1692 ChannelElement *che = NULL; | |
7578 | 1693 GetBitContext gb; |
1694 enum RawDataBlockType elem_type; | |
1695 int err, elem_id, data_size_tmp; | |
1696 | |
10004 | 1697 init_get_bits(&gb, buf, buf_size * 8); |
7578 | 1698 |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1699 if (show_bits(&gb, 12) == 0xfff) { |
9510 | 1700 if (parse_adts_frame_header(ac, &gb) < 0) { |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1701 av_log(avccontext, AV_LOG_ERROR, "Error decoding AAC frame header.\n"); |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1702 return -1; |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1703 } |
8812 | 1704 if (ac->m4ac.sampling_index > 12) { |
8789 | 1705 av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index); |
1706 return -1; | |
1707 } | |
8549
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1708 } |
2cbfa4cd4670
Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents:
8502
diff
changeset
|
1709 |
7578 | 1710 // parse |
1711 while ((elem_type = get_bits(&gb, 3)) != TYPE_END) { | |
1712 elem_id = get_bits(&gb, 4); | |
1713 | |
10004 | 1714 if (elem_type < TYPE_DSE && !(che=get_che(ac, elem_type, elem_id))) { |
8814 | 1715 av_log(ac->avccontext, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id); |
1716 return -1; | |
7578 | 1717 } |
1718 | |
1719 switch (elem_type) { | |
1720 | |
1721 case TYPE_SCE: | |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
1722 err = decode_ics(ac, &che->ch[0], &gb, 0, 0); |
7578 | 1723 break; |
1724 | |
1725 case TYPE_CPE: | |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
1726 err = decode_cpe(ac, &gb, che); |
7578 | 1727 break; |
1728 | |
1729 case TYPE_CCE: | |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
1730 err = decode_cce(ac, &gb, che); |
7578 | 1731 break; |
1732 | |
1733 case TYPE_LFE: | |
9149
955835e2bc99
Fix the channel allocation bug/assumption (issue 800).
alexc
parents:
9143
diff
changeset
|
1734 err = decode_ics(ac, &che->ch[0], &gb, 0, 0); |
7578 | 1735 break; |
1736 | |
1737 case TYPE_DSE: | |
1738 skip_data_stream_element(&gb); | |
1739 err = 0; | |
1740 break; | |
1741 | |
10004 | 1742 case TYPE_PCE: { |
7578 | 1743 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID]; |
1744 memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])); | |
10004 | 1745 if ((err = decode_pce(ac, new_che_pos, &gb))) |
7578 | 1746 break; |
9948
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1747 if (ac->output_configured) |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1748 av_log(avccontext, AV_LOG_ERROR, |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1749 "Not evaluating a further program_config_element as this construct is dubious at best.\n"); |
98fd723f72e7
Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents:
9891
diff
changeset
|
1750 else |
9949 | 1751 err = output_configure(ac, ac->che_pos, new_che_pos, 0); |
7578 | 1752 break; |
1753 } | |
1754 | |
1755 case TYPE_FIL: | |
1756 if (elem_id == 15) | |
1757 elem_id += get_bits(&gb, 8) - 1; | |
1758 while (elem_id > 0) | |
1759 elem_id -= decode_extension_payload(ac, &gb, elem_id); | |
1760 err = 0; /* FIXME */ | |
1761 break; | |
1762 | |
1763 default: | |
1764 err = -1; /* should not happen, but keeps compiler happy */ | |
1765 break; | |
1766 } | |
1767 | |
10004 | 1768 if (err) |
7578 | 1769 return err; |
1770 } | |
1771 | |
1772 spectral_to_sample(ac); | |
1773 | |
7539 | 1774 if (!ac->is_saved) { |
1775 ac->is_saved = 1; | |
1776 *data_size = 0; | |
7580 | 1777 return buf_size; |
7539 | 1778 } |
1779 | |
1780 data_size_tmp = 1024 * avccontext->channels * sizeof(int16_t); | |
10004 | 1781 if (*data_size < data_size_tmp) { |
7539 | 1782 av_log(avccontext, AV_LOG_ERROR, |
1783 "Output buffer too small (%d) or trying to output too many samples (%d) for this frame.\n", | |
1784 *data_size, data_size_tmp); | |
1785 return -1; | |
1786 } | |
1787 *data_size = data_size_tmp; | |
1788 | |
1789 ac->dsp.float_to_int16_interleave(data, (const float **)ac->output_data, 1024, avccontext->channels); | |
1790 | |
1791 return buf_size; | |
1792 } | |
1793 | |
10004 | 1794 static av_cold int aac_decode_close(AVCodecContext *avccontext) |
1795 { | |
1796 AACContext *ac = avccontext->priv_data; | |
7540 | 1797 int i, type; |
7501 | 1798 |
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1799 for (i = 0; i < MAX_ELEM_ID; i++) { |
10004 | 1800 for (type = 0; type < 4; type++) |
7540 | 1801 av_freep(&ac->che[type][i]); |
7501 | 1802 } |
1803 | |
1804 ff_mdct_end(&ac->mdct); | |
1805 ff_mdct_end(&ac->mdct_small); | |
10004 | 1806 return 0; |
7501 | 1807 } |
1808 | |
1809 AVCodec aac_decoder = { | |
1810 "aac", | |
1811 CODEC_TYPE_AUDIO, | |
1812 CODEC_ID_AAC, | |
1813 sizeof(AACContext), | |
1814 aac_decode_init, | |
1815 NULL, | |
1816 aac_decode_close, | |
1817 aac_decode_frame, | |
1818 .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), | |
10145
7955db355703
Make sample_fmts and channel_layouts compound literals const to reduce size of
reimar
parents:
10004
diff
changeset
|
1819 .sample_fmts = (const enum SampleFormat[]) { |
10004 | 1820 SAMPLE_FMT_S16,SAMPLE_FMT_NONE |
1821 }, | |
10306
c97a6cabee62
AAC: Add channel layout support for channel configuration as defined in the
superdump
parents:
10252
diff
changeset
|
1822 .channel_layouts = aac_channel_layout, |
7501 | 1823 }; |