Mercurial > libavcodec.hg
annotate aac.c @ 8281:f93efc084e41 libavcodec
Make av_log_missing_feature an internal function, and change its name
to ff_log_missing_feature.
| author | stefano |
|---|---|
| date | Mon, 08 Dec 2008 21:21:38 +0000 |
| parents | 843d82925adf |
| children | f4ead16781e4 |
| 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 /** | |
| 24 * @file aac.c | |
| 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" |
| 7501 | 81 #include "bitstream.h" |
| 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" |
| 89 | |
| 90 #include <assert.h> | |
| 91 #include <errno.h> | |
| 92 #include <math.h> | |
| 93 #include <string.h> | |
| 94 | |
| 95 static VLC vlc_scalefactors; | |
| 96 static VLC vlc_spectral[11]; | |
| 97 | |
| 98 | |
| 7539 | 99 /** |
| 7578 | 100 * Configure output channel order based on the current program configuration element. |
| 101 * | |
| 102 * @param che_pos current channel position configuration | |
| 103 * @param new_che_pos New channel position configuration - we only do something if it differs from the current one. | |
| 104 * | |
| 105 * @return Returns error status. 0 - OK, !0 - error | |
| 106 */ | |
| 107 static int output_configure(AACContext *ac, enum ChannelPosition che_pos[4][MAX_ELEM_ID], | |
| 108 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID]) { | |
| 109 AVCodecContext *avctx = ac->avccontext; | |
| 110 int i, type, channels = 0; | |
| 111 | |
| 112 if(!memcmp(che_pos, new_che_pos, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0]))) | |
| 113 return 0; /* no change */ | |
| 114 | |
| 115 memcpy(che_pos, new_che_pos, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])); | |
| 116 | |
| 117 /* Allocate or free elements depending on if they are in the | |
| 118 * current program configuration. | |
| 119 * | |
| 120 * Set up default 1:1 output mapping. | |
| 121 * | |
| 122 * 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
|
123 * [ Center ] [ Front Left ] [ Front Right ] [ LFE ] [ Surround Left ] [ Surround Right ] |
| 7578 | 124 */ |
| 125 | |
| 126 for(i = 0; i < MAX_ELEM_ID; i++) { | |
| 127 for(type = 0; type < 4; type++) { | |
| 128 if(che_pos[type][i]) { | |
| 129 if(!ac->che[type][i] && !(ac->che[type][i] = av_mallocz(sizeof(ChannelElement)))) | |
| 130 return AVERROR(ENOMEM); | |
| 131 if(type != TYPE_CCE) { | |
| 132 ac->output_data[channels++] = ac->che[type][i]->ch[0].ret; | |
| 133 if(type == TYPE_CPE) { | |
| 134 ac->output_data[channels++] = ac->che[type][i]->ch[1].ret; | |
| 135 } | |
| 136 } | |
| 137 } else | |
| 138 av_freep(&ac->che[type][i]); | |
| 139 } | |
| 140 } | |
| 141 | |
| 142 avctx->channels = channels; | |
| 143 return 0; | |
| 144 } | |
| 145 | |
| 146 /** | |
| 7539 | 147 * Decode an array of 4 bit element IDs, optionally interleaved with a stereo/mono switching bit. |
| 148 * | |
| 149 * @param cpe_map Stereo (Channel Pair Element) map, NULL if stereo bit is not present. | |
| 150 * @param sce_map mono (Single Channel Element) map | |
| 151 * @param type speaker type/position for these channels | |
| 152 */ | |
| 153 static void decode_channel_map(enum ChannelPosition *cpe_map, | |
| 154 enum ChannelPosition *sce_map, enum ChannelPosition type, GetBitContext * gb, int n) { | |
| 155 while(n--) { | |
| 156 enum ChannelPosition *map = cpe_map && get_bits1(gb) ? cpe_map : sce_map; // stereo or mono map | |
| 157 map[get_bits(gb, 4)] = type; | |
| 158 } | |
| 159 } | |
| 160 | |
| 161 /** | |
| 162 * Decode program configuration element; reference: table 4.2. | |
| 163 * | |
| 164 * @param new_che_pos New channel position configuration - we only do something if it differs from the current one. | |
| 165 * | |
| 166 * @return Returns error status. 0 - OK, !0 - error | |
| 167 */ | |
| 168 static int decode_pce(AACContext * ac, enum ChannelPosition new_che_pos[4][MAX_ELEM_ID], | |
| 169 GetBitContext * gb) { | |
| 170 int num_front, num_side, num_back, num_lfe, num_assoc_data, num_cc; | |
| 171 | |
| 172 skip_bits(gb, 2); // object_type | |
| 173 | |
| 174 ac->m4ac.sampling_index = get_bits(gb, 4); | |
| 175 if(ac->m4ac.sampling_index > 11) { | |
| 176 av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index); | |
| 177 return -1; | |
| 178 } | |
| 179 ac->m4ac.sample_rate = ff_mpeg4audio_sample_rates[ac->m4ac.sampling_index]; | |
| 7501 | 180 num_front = get_bits(gb, 4); |
| 181 num_side = get_bits(gb, 4); | |
| 182 num_back = get_bits(gb, 4); | |
| 183 num_lfe = get_bits(gb, 2); | |
| 184 num_assoc_data = get_bits(gb, 3); | |
| 185 num_cc = get_bits(gb, 4); | |
| 186 | |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
187 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
|
188 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
|
189 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
|
190 skip_bits(gb, 4); // stereo_mixdown_tag |
| 7501 | 191 |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
192 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
|
193 skip_bits(gb, 3); // mixdown_coeff_index and pseudo_surround |
| 7501 | 194 |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
195 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
|
196 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
|
197 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
|
198 decode_channel_map(NULL, new_che_pos[TYPE_LFE], AAC_CHANNEL_LFE, gb, num_lfe ); |
| 7501 | 199 |
| 200 skip_bits_long(gb, 4 * num_assoc_data); | |
| 201 | |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
202 decode_channel_map(new_che_pos[TYPE_CCE], new_che_pos[TYPE_CCE], AAC_CHANNEL_CC, gb, num_cc ); |
| 7501 | 203 |
| 204 align_get_bits(gb); | |
| 205 | |
| 206 /* comment field, first byte is length */ | |
| 207 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
|
208 return 0; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
209 } |
| 7501 | 210 |
| 7539 | 211 /** |
| 212 * Set up channel positions based on a default channel configuration | |
| 213 * as specified in table 1.17. | |
| 214 * | |
| 215 * @param new_che_pos New channel position configuration - we only do something if it differs from the current one. | |
| 216 * | |
| 217 * @return Returns error status. 0 - OK, !0 - error | |
| 218 */ | |
| 219 static int set_default_channel_config(AACContext *ac, enum ChannelPosition new_che_pos[4][MAX_ELEM_ID], | |
| 220 int channel_config) | |
| 221 { | |
| 222 if(channel_config < 1 || channel_config > 7) { | |
| 223 av_log(ac->avccontext, AV_LOG_ERROR, "invalid default channel configuration (%d)\n", | |
| 224 channel_config); | |
| 225 return -1; | |
| 226 } | |
| 227 | |
| 228 /* default channel configurations: | |
| 229 * | |
| 230 * 1ch : front center (mono) | |
| 231 * 2ch : L + R (stereo) | |
| 232 * 3ch : front center + L + R | |
| 233 * 4ch : front center + L + R + back center | |
| 234 * 5ch : front center + L + R + back stereo | |
| 235 * 6ch : front center + L + R + back stereo + LFE | |
| 236 * 7ch : front center + L + R + outer front left + outer front right + back stereo + LFE | |
| 237 */ | |
| 238 | |
| 239 if(channel_config != 2) | |
| 240 new_che_pos[TYPE_SCE][0] = AAC_CHANNEL_FRONT; // front center (or mono) | |
| 241 if(channel_config > 1) | |
| 242 new_che_pos[TYPE_CPE][0] = AAC_CHANNEL_FRONT; // L + R (or stereo) | |
| 243 if(channel_config == 4) | |
| 244 new_che_pos[TYPE_SCE][1] = AAC_CHANNEL_BACK; // back center | |
| 245 if(channel_config > 4) | |
| 246 new_che_pos[TYPE_CPE][(channel_config == 7) + 1] | |
| 247 = AAC_CHANNEL_BACK; // back stereo | |
| 248 if(channel_config > 5) | |
| 249 new_che_pos[TYPE_LFE][0] = AAC_CHANNEL_LFE; // LFE | |
| 250 if(channel_config == 7) | |
| 251 new_che_pos[TYPE_CPE][1] = AAC_CHANNEL_FRONT; // outer front left + outer front right | |
| 252 | |
| 253 return 0; | |
| 254 } | |
| 255 | |
| 7578 | 256 /** |
| 257 * Decode GA "General Audio" specific configuration; reference: table 4.1. | |
| 258 * | |
| 259 * @return Returns error status. 0 - OK, !0 - error | |
| 260 */ | |
| 261 static int decode_ga_specific_config(AACContext * ac, GetBitContext * gb, int channel_config) { | |
| 262 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID]; | |
| 263 int extension_flag, ret; | |
| 264 | |
| 265 if(get_bits1(gb)) { // frameLengthFlag | |
|
8281
f93efc084e41
Make av_log_missing_feature an internal function, and change its name
stefano
parents:
8200
diff
changeset
|
266 ff_log_missing_feature(ac->avccontext, "960/120 MDCT window is", 1); |
| 7539 | 267 return -1; |
| 268 } | |
| 269 | |
| 270 if (get_bits1(gb)) // dependsOnCoreCoder | |
| 271 skip_bits(gb, 14); // coreCoderDelay | |
| 272 extension_flag = get_bits1(gb); | |
| 273 | |
| 274 if(ac->m4ac.object_type == AOT_AAC_SCALABLE || | |
| 275 ac->m4ac.object_type == AOT_ER_AAC_SCALABLE) | |
| 276 skip_bits(gb, 3); // layerNr | |
| 277 | |
| 278 memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])); | |
| 279 if (channel_config == 0) { | |
| 280 skip_bits(gb, 4); // element_instance_tag | |
| 281 if((ret = decode_pce(ac, new_che_pos, gb))) | |
| 282 return ret; | |
| 283 } else { | |
| 284 if((ret = set_default_channel_config(ac, new_che_pos, channel_config))) | |
| 285 return ret; | |
| 286 } | |
| 287 if((ret = output_configure(ac, ac->che_pos, new_che_pos))) | |
| 288 return ret; | |
| 289 | |
| 290 if (extension_flag) { | |
| 291 switch (ac->m4ac.object_type) { | |
| 292 case AOT_ER_BSAC: | |
| 293 skip_bits(gb, 5); // numOfSubFrame | |
| 294 skip_bits(gb, 11); // layer_length | |
| 295 break; | |
| 296 case AOT_ER_AAC_LC: | |
| 297 case AOT_ER_AAC_LTP: | |
| 298 case AOT_ER_AAC_SCALABLE: | |
| 299 case AOT_ER_AAC_LD: | |
| 300 skip_bits(gb, 3); /* aacSectionDataResilienceFlag | |
| 301 * aacScalefactorDataResilienceFlag | |
| 302 * aacSpectralDataResilienceFlag | |
| 303 */ | |
| 304 break; | |
| 305 } | |
| 306 skip_bits1(gb); // extensionFlag3 (TBD in version 3) | |
| 307 } | |
| 308 return 0; | |
| 309 } | |
| 310 | |
| 311 /** | |
| 312 * Decode audio specific configuration; reference: table 1.13. | |
| 313 * | |
| 314 * @param data pointer to AVCodecContext extradata | |
| 315 * @param data_size size of AVCCodecContext extradata | |
| 316 * | |
| 317 * @return Returns error status. 0 - OK, !0 - error | |
| 318 */ | |
| 319 static int decode_audio_specific_config(AACContext * ac, void *data, int data_size) { | |
| 320 GetBitContext gb; | |
| 321 int i; | |
| 322 | |
| 323 init_get_bits(&gb, data, data_size * 8); | |
| 324 | |
| 325 if((i = ff_mpeg4audio_get_config(&ac->m4ac, data, data_size)) < 0) | |
| 326 return -1; | |
| 327 if(ac->m4ac.sampling_index > 11) { | |
| 328 av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index); | |
| 329 return -1; | |
| 330 } | |
| 331 | |
| 332 skip_bits_long(&gb, i); | |
| 333 | |
| 334 switch (ac->m4ac.object_type) { | |
|
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
335 case AOT_AAC_MAIN: |
| 7539 | 336 case AOT_AAC_LC: |
| 337 if (decode_ga_specific_config(ac, &gb, ac->m4ac.chan_config)) | |
| 338 return -1; | |
| 339 break; | |
| 340 default: | |
| 341 av_log(ac->avccontext, AV_LOG_ERROR, "Audio object type %s%d is not supported.\n", | |
| 342 ac->m4ac.sbr == 1? "SBR+" : "", ac->m4ac.object_type); | |
| 343 return -1; | |
| 344 } | |
| 345 return 0; | |
| 346 } | |
| 347 | |
| 7578 | 348 /** |
| 349 * linear congruential pseudorandom number generator | |
| 350 * | |
| 351 * @param previous_val pointer to the current state of the generator | |
| 352 * | |
| 353 * @return Returns a 32-bit pseudorandom integer | |
| 354 */ | |
| 355 static av_always_inline int lcg_random(int previous_val) { | |
| 356 return previous_val * 1664525 + 1013904223; | |
| 357 } | |
| 358 | |
|
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
359 static void reset_predict_state(PredictorState * ps) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
360 ps->r0 = 0.0f; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
361 ps->r1 = 0.0f; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
362 ps->cor0 = 0.0f; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
363 ps->cor1 = 0.0f; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
364 ps->var0 = 1.0f; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
365 ps->var1 = 1.0f; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
366 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
367 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
368 static void reset_all_predictors(PredictorState * ps) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
369 int i; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
370 for (i = 0; i < MAX_PREDICTORS; i++) |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
371 reset_predict_state(&ps[i]); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
372 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
373 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
374 static void reset_predictor_group(PredictorState * ps, int group_num) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
375 int i; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
376 for (i = group_num-1; i < MAX_PREDICTORS; i+=30) |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
377 reset_predict_state(&ps[i]); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
378 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
379 |
| 7501 | 380 static av_cold int aac_decode_init(AVCodecContext * avccontext) { |
| 381 AACContext * ac = avccontext->priv_data; | |
| 382 int i; | |
| 383 | |
| 384 ac->avccontext = avccontext; | |
| 385 | |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
386 if (avccontext->extradata_size <= 0 || |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
387 decode_audio_specific_config(ac, avccontext->extradata, avccontext->extradata_size)) |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
388 return -1; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
389 |
| 7539 | 390 avccontext->sample_fmt = SAMPLE_FMT_S16; |
| 7501 | 391 avccontext->sample_rate = ac->m4ac.sample_rate; |
| 392 avccontext->frame_size = 1024; | |
| 393 | |
| 394 AAC_INIT_VLC_STATIC( 0, 144); | |
| 395 AAC_INIT_VLC_STATIC( 1, 114); | |
| 396 AAC_INIT_VLC_STATIC( 2, 188); | |
| 397 AAC_INIT_VLC_STATIC( 3, 180); | |
| 398 AAC_INIT_VLC_STATIC( 4, 172); | |
| 399 AAC_INIT_VLC_STATIC( 5, 140); | |
| 400 AAC_INIT_VLC_STATIC( 6, 168); | |
| 401 AAC_INIT_VLC_STATIC( 7, 114); | |
| 402 AAC_INIT_VLC_STATIC( 8, 262); | |
| 403 AAC_INIT_VLC_STATIC( 9, 248); | |
| 404 AAC_INIT_VLC_STATIC(10, 384); | |
| 405 | |
| 406 dsputil_init(&ac->dsp, avccontext); | |
| 407 | |
| 7539 | 408 ac->random_state = 0x1f2e3d4c; |
| 409 | |
| 7501 | 410 // -1024 - Compensate wrong IMDCT method. |
| 411 // 32768 - Required to scale values to the correct range for the bias method | |
| 412 // for float to int16 conversion. | |
| 413 | |
| 414 if(ac->dsp.float_to_int16 == ff_float_to_int16_c) { | |
| 415 ac->add_bias = 385.0f; | |
| 416 ac->sf_scale = 1. / (-1024. * 32768.); | |
| 417 ac->sf_offset = 0; | |
| 418 } else { | |
| 419 ac->add_bias = 0.0f; | |
| 420 ac->sf_scale = 1. / -1024.; | |
| 421 ac->sf_offset = 60; | |
| 422 } | |
| 423 | |
| 424 #ifndef CONFIG_HARDCODED_TABLES | |
|
8109
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
425 for (i = 0; i < 428; i++) |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
426 ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.); |
| 7501 | 427 #endif /* CONFIG_HARDCODED_TABLES */ |
| 428 | |
| 8042 | 429 INIT_VLC_STATIC(&vlc_scalefactors,7,FF_ARRAY_ELEMS(ff_aac_scalefactor_code), |
| 7501 | 430 ff_aac_scalefactor_bits, sizeof(ff_aac_scalefactor_bits[0]), sizeof(ff_aac_scalefactor_bits[0]), |
| 431 ff_aac_scalefactor_code, sizeof(ff_aac_scalefactor_code[0]), sizeof(ff_aac_scalefactor_code[0]), | |
| 432 352); | |
| 433 | |
| 434 ff_mdct_init(&ac->mdct, 11, 1); | |
| 435 ff_mdct_init(&ac->mdct_small, 8, 1); | |
| 7581 | 436 // window initialization |
| 437 ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024); | |
| 438 ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128); | |
| 439 ff_sine_window_init(ff_sine_1024, 1024); | |
| 440 ff_sine_window_init(ff_sine_128, 128); | |
| 441 | |
| 7501 | 442 return 0; |
| 443 } | |
| 444 | |
| 7539 | 445 /** |
| 446 * Skip data_stream_element; reference: table 4.10. | |
| 447 */ | |
| 448 static void skip_data_stream_element(GetBitContext * gb) { | |
| 7501 | 449 int byte_align = get_bits1(gb); |
| 450 int count = get_bits(gb, 8); | |
| 451 if (count == 255) | |
| 452 count += get_bits(gb, 8); | |
| 453 if (byte_align) | |
| 454 align_get_bits(gb); | |
| 455 skip_bits_long(gb, 8 * count); | |
| 456 } | |
| 457 | |
|
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
458 static int decode_prediction(AACContext * ac, IndividualChannelStream * ics, GetBitContext * gb) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
459 int sfb; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
460 if (get_bits1(gb)) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
461 ics->predictor_reset_group = get_bits(gb, 5); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
462 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
|
463 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
|
464 return -1; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
465 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
466 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
467 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
|
468 ics->prediction_used[sfb] = get_bits1(gb); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
469 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
470 return 0; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
471 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
472 |
| 7501 | 473 /** |
| 7539 | 474 * Decode Individual Channel Stream info; reference: table 4.6. |
| 475 * | |
| 476 * @param common_window Channels have independent [0], or shared [1], Individual Channel Stream information. | |
| 477 */ | |
| 478 static int decode_ics_info(AACContext * ac, IndividualChannelStream * ics, GetBitContext * gb, int common_window) { | |
| 479 if (get_bits1(gb)) { | |
| 480 av_log(ac->avccontext, AV_LOG_ERROR, "Reserved bit set.\n"); | |
| 481 memset(ics, 0, sizeof(IndividualChannelStream)); | |
| 482 return -1; | |
| 483 } | |
| 484 ics->window_sequence[1] = ics->window_sequence[0]; | |
| 485 ics->window_sequence[0] = get_bits(gb, 2); | |
| 486 ics->use_kb_window[1] = ics->use_kb_window[0]; | |
| 487 ics->use_kb_window[0] = get_bits1(gb); | |
| 488 ics->num_window_groups = 1; | |
| 489 ics->group_len[0] = 1; | |
| 7581 | 490 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { |
| 491 int i; | |
| 492 ics->max_sfb = get_bits(gb, 4); | |
| 493 for (i = 0; i < 7; i++) { | |
| 494 if (get_bits1(gb)) { | |
| 495 ics->group_len[ics->num_window_groups-1]++; | |
| 496 } else { | |
| 497 ics->num_window_groups++; | |
| 498 ics->group_len[ics->num_window_groups-1] = 1; | |
| 499 } | |
| 500 } | |
| 501 ics->num_windows = 8; | |
| 502 ics->swb_offset = swb_offset_128[ac->m4ac.sampling_index]; | |
| 503 ics->num_swb = ff_aac_num_swb_128[ac->m4ac.sampling_index]; | |
| 504 ics->tns_max_bands = tns_max_bands_128[ac->m4ac.sampling_index]; | |
|
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
505 ics->predictor_present = 0; |
| 7581 | 506 } else { |
| 507 ics->max_sfb = get_bits(gb, 6); | |
| 508 ics->num_windows = 1; | |
| 509 ics->swb_offset = swb_offset_1024[ac->m4ac.sampling_index]; | |
| 510 ics->num_swb = ff_aac_num_swb_1024[ac->m4ac.sampling_index]; | |
| 511 ics->tns_max_bands = tns_max_bands_1024[ac->m4ac.sampling_index]; | |
|
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
512 ics->predictor_present = get_bits1(gb); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
513 ics->predictor_reset_group = 0; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
514 if (ics->predictor_present) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
515 if (ac->m4ac.object_type == AOT_AAC_MAIN) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
516 if (decode_prediction(ac, ics, gb)) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
517 memset(ics, 0, sizeof(IndividualChannelStream)); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
518 return -1; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
519 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
520 } else if (ac->m4ac.object_type == AOT_AAC_LC) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
521 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
|
522 memset(ics, 0, sizeof(IndividualChannelStream)); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
523 return -1; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
524 } else { |
|
8281
f93efc084e41
Make av_log_missing_feature an internal function, and change its name
stefano
parents:
8200
diff
changeset
|
525 ff_log_missing_feature(ac->avccontext, "Predictor bit set but LTP is", 1); |
| 8200 | 526 memset(ics, 0, sizeof(IndividualChannelStream)); |
| 527 return -1; | |
|
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
528 } |
| 7578 | 529 } |
| 530 } | |
| 531 | |
| 532 if(ics->max_sfb > ics->num_swb) { | |
| 533 av_log(ac->avccontext, AV_LOG_ERROR, | |
| 534 "Number of scalefactor bands in group (%d) exceeds limit (%d).\n", | |
| 535 ics->max_sfb, ics->num_swb); | |
| 536 memset(ics, 0, sizeof(IndividualChannelStream)); | |
| 537 return -1; | |
| 538 } | |
| 539 | |
| 7539 | 540 return 0; |
| 541 } | |
| 542 | |
| 543 /** | |
| 544 * Decode band types (section_data payload); reference: table 4.46. | |
| 545 * | |
| 546 * @param band_type array of the used band type | |
| 547 * @param band_type_run_end array of the last scalefactor band of a band type run | |
| 548 * | |
| 549 * @return Returns error status. 0 - OK, !0 - error | |
| 550 */ | |
| 551 static int decode_band_types(AACContext * ac, enum BandType band_type[120], | |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
552 int band_type_run_end[120], GetBitContext * gb, IndividualChannelStream * ics) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
553 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
|
554 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
|
555 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
|
556 int k = 0; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
557 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
|
558 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
|
559 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
|
560 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
|
561 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
|
562 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
|
563 return -1; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
564 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
565 while ((sect_len_incr = get_bits(gb, bits)) == (1 << bits)-1) |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
566 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
|
567 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
|
568 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
|
569 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
|
570 "Number of bands (%d) exceeds limit (%d).\n", |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
571 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
|
572 return -1; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
573 } |
| 7581 | 574 for (; k < sect_len; k++) { |
| 575 band_type [idx] = sect_band_type; | |
| 576 band_type_run_end[idx++] = sect_len; | |
| 577 } | |
| 7539 | 578 } |
| 579 } | |
| 580 return 0; | |
| 581 } | |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
582 |
| 7539 | 583 /** |
| 584 * 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
|
585 * |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
586 * @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
|
587 * @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
|
588 * @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
|
589 * @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
|
590 * |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
591 * @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
|
592 */ |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
593 static int decode_scalefactors(AACContext * ac, float sf[120], GetBitContext * gb, |
| 7540 | 594 unsigned int global_gain, IndividualChannelStream * ics, |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
595 enum BandType band_type[120], int band_type_run_end[120]) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
596 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
|
597 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
|
598 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
|
599 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
|
600 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
|
601 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
|
602 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
|
603 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
|
604 if (band_type[idx] == ZERO_BT) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
605 for(; i < run_end; i++, idx++) |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
606 sf[idx] = 0.; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
607 }else if((band_type[idx] == INTENSITY_BT) || (band_type[idx] == INTENSITY_BT2)) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
608 for(; i < run_end; i++, idx++) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
609 offset[2] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
610 if(offset[2] > 255U) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
611 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
|
612 "%s (%d) out of range.\n", sf_str[2], offset[2]); |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
613 return -1; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
614 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
615 sf[idx] = ff_aac_pow2sf_tab[-offset[2] + 300]; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
616 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
617 }else if(band_type[idx] == NOISE_BT) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
618 for(; i < run_end; i++, idx++) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
619 if(noise_flag-- > 0) |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
620 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
|
621 else |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
622 offset[1] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
623 if(offset[1] > 255U) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
624 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
|
625 "%s (%d) out of range.\n", sf_str[1], offset[1]); |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
626 return -1; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
627 } |
|
8109
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
628 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
|
629 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
630 }else { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
631 for(; i < run_end; i++, idx++) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
632 offset[0] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
633 if(offset[0] > 255U) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
634 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
|
635 "%s (%d) out of range.\n", sf_str[0], offset[0]); |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
636 return -1; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
637 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
638 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
|
639 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
640 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
641 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
642 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
643 return 0; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
644 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
645 |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
646 /** |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
647 * 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
|
648 */ |
|
7871
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
649 static int decode_pulses(Pulse * pulse, GetBitContext * gb, const uint16_t * swb_offset, int num_swb) { |
|
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
650 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
|
651 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
|
652 pulse_swb = get_bits(gb, 6); |
|
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
653 if (pulse_swb >= num_swb) |
|
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
654 return -1; |
|
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
655 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
|
656 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
|
657 if (pulse->pos[0] > 1023) |
|
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
658 return -1; |
| 7580 | 659 pulse->amp[0] = get_bits(gb, 4); |
| 660 for (i = 1; i < pulse->num_pulse; i++) { | |
| 661 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
|
662 if (pulse->pos[i] > 1023) |
|
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
663 return -1; |
| 7580 | 664 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
|
665 } |
|
7871
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
666 return 0; |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
667 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
668 |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
669 /** |
| 7609 | 670 * Decode Temporal Noise Shaping data; reference: table 4.48. |
| 671 * | |
| 672 * @return Returns error status. 0 - OK, !0 - error | |
| 673 */ | |
| 674 static int decode_tns(AACContext * ac, TemporalNoiseShaping * tns, | |
| 675 GetBitContext * gb, const IndividualChannelStream * ics) { | |
| 676 int w, filt, i, coef_len, coef_res, coef_compress; | |
| 677 const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE; | |
| 678 const int tns_max_order = is8 ? 7 : ac->m4ac.object_type == AOT_AAC_MAIN ? 20 : 12; | |
| 679 for (w = 0; w < ics->num_windows; w++) { | |
|
7637
1fd8e319e8b6
Work around GCC variable may be used uninitialised warning
superdump
parents:
7636
diff
changeset
|
680 if ((tns->n_filt[w] = get_bits(gb, 2 - is8))) { |
| 7609 | 681 coef_res = get_bits1(gb); |
| 682 | |
| 7638 | 683 for (filt = 0; filt < tns->n_filt[w]; filt++) { |
| 684 int tmp2_idx; | |
| 685 tns->length[w][filt] = get_bits(gb, 6 - 2*is8); | |
| 7609 | 686 |
| 7638 | 687 if ((tns->order[w][filt] = get_bits(gb, 5 - 2*is8)) > tns_max_order) { |
| 688 av_log(ac->avccontext, AV_LOG_ERROR, "TNS filter order %d is greater than maximum %d.", | |
| 689 tns->order[w][filt], tns_max_order); | |
| 690 tns->order[w][filt] = 0; | |
| 691 return -1; | |
| 692 } | |
|
7850
77030651ddd0
Only read some of TNS bitstream data in the case that the TNS filter order is
superdump
parents:
7845
diff
changeset
|
693 if (tns->order[w][filt]) { |
| 7851 | 694 tns->direction[w][filt] = get_bits1(gb); |
| 695 coef_compress = get_bits1(gb); | |
| 696 coef_len = coef_res + 3 - coef_compress; | |
| 697 tmp2_idx = 2*coef_compress + coef_res; | |
| 7638 | 698 |
| 7851 | 699 for (i = 0; i < tns->order[w][filt]; i++) |
| 700 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
|
701 } |
| 7609 | 702 } |
|
7637
1fd8e319e8b6
Work around GCC variable may be used uninitialised warning
superdump
parents:
7636
diff
changeset
|
703 } |
| 7609 | 704 } |
| 705 return 0; | |
| 706 } | |
| 707 | |
| 708 /** | |
| 7539 | 709 * Decode Mid/Side data; reference: table 4.54. |
| 710 * | |
| 711 * @param ms_present Indicates mid/side stereo presence. [0] mask is all 0s; | |
| 712 * [1] mask is decoded from bitstream; [2] mask is all 1s; | |
| 713 * [3] reserved for scalable AAC | |
| 714 */ | |
| 715 static void decode_mid_side_stereo(ChannelElement * cpe, GetBitContext * gb, | |
| 716 int ms_present) { | |
| 7578 | 717 int idx; |
| 718 if (ms_present == 1) { | |
| 719 for (idx = 0; idx < cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb; idx++) | |
| 720 cpe->ms_mask[idx] = get_bits1(gb); | |
| 721 } else if (ms_present == 2) { | |
| 722 memset(cpe->ms_mask, 1, cpe->ch[0].ics.num_window_groups * cpe->ch[0].ics.max_sfb * sizeof(cpe->ms_mask[0])); | |
| 723 } | |
| 724 } | |
| 7539 | 725 |
| 726 /** | |
| 7581 | 727 * Decode spectral data; reference: table 4.50. |
| 728 * Dequantize and scale spectral data; reference: 4.6.3.3. | |
| 729 * | |
| 730 * @param coef array of dequantized, scaled spectral data | |
| 731 * @param sf array of scalefactors or intensity stereo positions | |
| 732 * @param pulse_present set if pulses are present | |
| 733 * @param pulse pointer to pulse data struct | |
| 734 * @param band_type array of the used band type | |
| 735 * | |
| 736 * @return Returns error status. 0 - OK, !0 - error | |
| 737 */ | |
| 738 static int decode_spectrum_and_dequant(AACContext * ac, float coef[1024], GetBitContext * gb, float sf[120], | |
| 739 int pulse_present, const Pulse * pulse, const IndividualChannelStream * ics, enum BandType band_type[120]) { | |
| 740 int i, k, g, idx = 0; | |
| 741 const int c = 1024/ics->num_windows; | |
| 742 const uint16_t * offsets = ics->swb_offset; | |
| 743 float *coef_base = coef; | |
| 744 | |
| 745 for (g = 0; g < ics->num_windows; g++) | |
| 746 memset(coef + g * 128 + offsets[ics->max_sfb], 0, sizeof(float)*(c - offsets[ics->max_sfb])); | |
| 747 | |
| 748 for (g = 0; g < ics->num_window_groups; g++) { | |
| 749 for (i = 0; i < ics->max_sfb; i++, idx++) { | |
| 750 const int cur_band_type = band_type[idx]; | |
| 751 const int dim = cur_band_type >= FIRST_PAIR_BT ? 2 : 4; | |
| 752 const int is_cb_unsigned = IS_CODEBOOK_UNSIGNED(cur_band_type); | |
| 753 int group; | |
| 754 if (cur_band_type == ZERO_BT) { | |
| 755 for (group = 0; group < ics->group_len[g]; group++) { | |
| 756 memset(coef + group * 128 + offsets[i], 0, (offsets[i+1] - offsets[i])*sizeof(float)); | |
| 757 } | |
| 758 }else if (cur_band_type == NOISE_BT) { | |
| 759 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
|
760 float scale; |
|
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
761 float band_energy = 0; |
| 7581 | 762 for (k = offsets[i]; k < offsets[i+1]; k++) { |
| 763 ac->random_state = lcg_random(ac->random_state); | |
|
8109
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
764 coef[group*128+k] = ac->random_state; |
|
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
765 band_energy += coef[group*128+k]*coef[group*128+k]; |
|
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
766 } |
|
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
767 scale = sf[idx] / sqrtf(band_energy); |
|
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
768 for (k = offsets[i]; k < offsets[i+1]; k++) { |
|
7baa25290231
Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents:
8042
diff
changeset
|
769 coef[group*128+k] *= scale; |
| 7581 | 770 } |
| 771 } | |
| 772 }else if (cur_band_type != INTENSITY_BT2 && cur_band_type != INTENSITY_BT) { | |
| 773 for (group = 0; group < ics->group_len[g]; group++) { | |
| 774 for (k = offsets[i]; k < offsets[i+1]; k += dim) { | |
| 775 const int index = get_vlc2(gb, vlc_spectral[cur_band_type - 1].table, 6, 3); | |
| 776 const int coef_tmp_idx = (group << 7) + k; | |
| 777 const float *vq_ptr; | |
| 778 int j; | |
| 779 if(index >= ff_aac_spectral_sizes[cur_band_type - 1]) { | |
| 780 av_log(ac->avccontext, AV_LOG_ERROR, | |
| 781 "Read beyond end of ff_aac_codebook_vectors[%d][]. index %d >= %d\n", | |
| 782 cur_band_type - 1, index, ff_aac_spectral_sizes[cur_band_type - 1]); | |
| 783 return -1; | |
| 784 } | |
| 785 vq_ptr = &ff_aac_codebook_vectors[cur_band_type - 1][index * dim]; | |
| 786 if (is_cb_unsigned) { | |
| 787 for (j = 0; j < dim; j++) | |
| 788 if (vq_ptr[j]) | |
| 789 coef[coef_tmp_idx + j] = 1 - 2*(int)get_bits1(gb); | |
| 790 }else { | |
| 791 for (j = 0; j < dim; j++) | |
| 792 coef[coef_tmp_idx + j] = 1.0f; | |
| 793 } | |
| 794 if (cur_band_type == ESC_BT) { | |
| 795 for (j = 0; j < 2; j++) { | |
| 796 if (vq_ptr[j] == 64.0f) { | |
| 797 int n = 4; | |
| 798 /* The total length of escape_sequence must be < 22 bits according | |
| 799 to the specification (i.e. max is 11111111110xxxxxxxxxx). */ | |
| 800 while (get_bits1(gb) && n < 15) n++; | |
| 801 if(n == 15) { | |
| 802 av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n"); | |
| 803 return -1; | |
| 804 } | |
| 805 n = (1<<n) + get_bits(gb, n); | |
| 806 coef[coef_tmp_idx + j] *= cbrtf(fabsf(n)) * n; | |
| 807 }else | |
| 808 coef[coef_tmp_idx + j] *= vq_ptr[j]; | |
| 809 } | |
| 810 }else | |
| 811 for (j = 0; j < dim; j++) | |
| 812 coef[coef_tmp_idx + j] *= vq_ptr[j]; | |
| 813 for (j = 0; j < dim; j++) | |
| 814 coef[coef_tmp_idx + j] *= sf[idx]; | |
| 815 } | |
| 816 } | |
| 817 } | |
| 818 } | |
| 819 coef += ics->group_len[g]<<7; | |
| 820 } | |
| 821 | |
| 822 if (pulse_present) { | |
|
7857
d7801471cd52
Apply pulses to unscaled coefficients rather than scaled.
superdump
parents:
7856
diff
changeset
|
823 idx = 0; |
| 7581 | 824 for(i = 0; i < pulse->num_pulse; i++){ |
| 825 float co = coef_base[ pulse->pos[i] ]; | |
|
7857
d7801471cd52
Apply pulses to unscaled coefficients rather than scaled.
superdump
parents:
7856
diff
changeset
|
826 while(offsets[idx + 1] <= pulse->pos[i]) |
|
d7801471cd52
Apply pulses to unscaled coefficients rather than scaled.
superdump
parents:
7856
diff
changeset
|
827 idx++; |
|
d7801471cd52
Apply pulses to unscaled coefficients rather than scaled.
superdump
parents:
7856
diff
changeset
|
828 if (band_type[idx] != NOISE_BT && sf[idx]) { |
| 7858 | 829 float ico = -pulse->amp[i]; |
| 830 if (co) { | |
| 831 co /= sf[idx]; | |
| 832 ico = co / sqrtf(sqrtf(fabsf(co))) + (co > 0 ? -ico : ico); | |
| 833 } | |
| 834 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
|
835 } |
| 7581 | 836 } |
| 837 } | |
| 838 return 0; | |
| 839 } | |
| 840 | |
|
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
841 static av_always_inline float flt16_round(float pf) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
842 int exp; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
843 pf = frexpf(pf, &exp); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
844 pf = ldexpf(roundf(ldexpf(pf, 8)), exp-8); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
845 return pf; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
846 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
847 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
848 static av_always_inline float flt16_even(float pf) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
849 int exp; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
850 pf = frexpf(pf, &exp); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
851 pf = ldexpf(rintf(ldexpf(pf, 8)), exp-8); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
852 return pf; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
853 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
854 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
855 static av_always_inline float flt16_trunc(float pf) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
856 int exp; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
857 pf = frexpf(pf, &exp); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
858 pf = ldexpf(truncf(ldexpf(pf, 8)), exp-8); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
859 return pf; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
860 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
861 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
862 static void predict(AACContext * ac, PredictorState * ps, float* coef, int output_enable) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
863 const float a = 0.953125; // 61.0/64 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
864 const float alpha = 0.90625; // 29.0/32 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
865 float e0, e1; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
866 float pv; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
867 float k1, k2; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
868 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
869 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
|
870 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
|
871 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
872 pv = flt16_round(k1 * ps->r0 + k2 * ps->r1); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
873 if (output_enable) |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
874 *coef += pv * ac->sf_scale; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
875 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
876 e0 = *coef / ac->sf_scale; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
877 e1 = e0 - k1 * ps->r0; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
878 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
879 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
|
880 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
|
881 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
|
882 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
|
883 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
884 ps->r1 = flt16_trunc(a * (ps->r0 - k1 * e0)); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
885 ps->r0 = flt16_trunc(a * e0); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
886 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
887 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
888 /** |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
889 * Apply AAC-Main style frequency domain prediction. |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
890 */ |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
891 static void apply_prediction(AACContext * ac, SingleChannelElement * sce) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
892 int sfb, k; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
893 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
894 if (!sce->ics.predictor_initialized) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
895 reset_all_predictors(sce->ics.predictor_state); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
896 sce->ics.predictor_initialized = 1; |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
897 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
898 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
899 if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
900 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
|
901 for (k = sce->ics.swb_offset[sfb]; k < sce->ics.swb_offset[sfb + 1]; k++) { |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
902 predict(ac, &sce->ics.predictor_state[k], &sce->coeffs[k], |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
903 sce->ics.predictor_present && sce->ics.prediction_used[sfb]); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
904 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
905 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
906 if (sce->ics.predictor_reset_group) |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
907 reset_predictor_group(sce->ics.predictor_state, sce->ics.predictor_reset_group); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
908 } else |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
909 reset_all_predictors(sce->ics.predictor_state); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
910 } |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
911 |
| 7581 | 912 /** |
| 7539 | 913 * Decode an individual_channel_stream payload; reference: table 4.44. |
| 914 * | |
| 915 * @param common_window Channels have independent [0], or shared [1], Individual Channel Stream information. | |
| 916 * @param scale_flag scalable [1] or non-scalable [0] AAC (Unused until scalable AAC is implemented.) | |
| 917 * | |
| 918 * @return Returns error status. 0 - OK, !0 - error | |
| 919 */ | |
| 920 static int decode_ics(AACContext * ac, SingleChannelElement * sce, GetBitContext * gb, int common_window, int scale_flag) { | |
| 921 Pulse pulse; | |
| 922 TemporalNoiseShaping * tns = &sce->tns; | |
| 923 IndividualChannelStream * ics = &sce->ics; | |
| 924 float * out = sce->coeffs; | |
| 925 int global_gain, pulse_present = 0; | |
| 926 | |
| 7580 | 927 /* This assignment is to silence a GCC warning about the variable being used |
| 928 * uninitialized when in fact it always is. | |
| 7539 | 929 */ |
| 930 pulse.num_pulse = 0; | |
| 931 | |
| 932 global_gain = get_bits(gb, 8); | |
| 933 | |
| 934 if (!common_window && !scale_flag) { | |
| 935 if (decode_ics_info(ac, ics, gb, 0) < 0) | |
| 936 return -1; | |
| 937 } | |
| 938 | |
| 939 if (decode_band_types(ac, sce->band_type, sce->band_type_run_end, gb, ics) < 0) | |
| 940 return -1; | |
| 941 if (decode_scalefactors(ac, sce->sf, gb, global_gain, ics, sce->band_type, sce->band_type_run_end) < 0) | |
| 942 return -1; | |
| 943 | |
| 944 pulse_present = 0; | |
| 945 if (!scale_flag) { | |
| 946 if ((pulse_present = get_bits1(gb))) { | |
| 947 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { | |
| 948 av_log(ac->avccontext, AV_LOG_ERROR, "Pulse tool not allowed in eight short sequence.\n"); | |
| 949 return -1; | |
| 950 } | |
|
7871
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
951 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
|
952 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
|
953 return -1; |
|
8277c41b7160
Validate pulse position and error out if an invalid position is encountered.
superdump
parents:
7858
diff
changeset
|
954 } |
| 7539 | 955 } |
| 956 if ((tns->present = get_bits1(gb)) && decode_tns(ac, tns, gb, ics)) | |
| 957 return -1; | |
| 958 if (get_bits1(gb)) { | |
|
8281
f93efc084e41
Make av_log_missing_feature an internal function, and change its name
stefano
parents:
8200
diff
changeset
|
959 ff_log_missing_feature(ac->avccontext, "SSR", 1); |
| 7539 | 960 return -1; |
| 961 } | |
| 962 } | |
| 963 | |
| 7580 | 964 if (decode_spectrum_and_dequant(ac, out, gb, sce->sf, pulse_present, &pulse, ics, sce->band_type) < 0) |
| 7539 | 965 return -1; |
|
8199
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
966 |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
967 if(ac->m4ac.object_type == AOT_AAC_MAIN) |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
968 apply_prediction(ac, sce); |
|
8a8d40fe77d9
AAC: Frequency domain prediction and hence Main profile support
superdump
parents:
8109
diff
changeset
|
969 |
| 7539 | 970 return 0; |
| 971 } | |
| 972 | |
| 973 /** | |
| 7581 | 974 * Mid/Side stereo decoding; reference: 4.6.8.1.3. |
| 975 */ | |
| 976 static void apply_mid_side_stereo(ChannelElement * cpe) { | |
| 977 const IndividualChannelStream * ics = &cpe->ch[0].ics; | |
| 978 float *ch0 = cpe->ch[0].coeffs; | |
| 979 float *ch1 = cpe->ch[1].coeffs; | |
| 980 int g, i, k, group, idx = 0; | |
| 981 const uint16_t * offsets = ics->swb_offset; | |
| 982 for (g = 0; g < ics->num_window_groups; g++) { | |
| 983 for (i = 0; i < ics->max_sfb; i++, idx++) { | |
| 984 if (cpe->ms_mask[idx] && | |
| 985 cpe->ch[0].band_type[idx] < NOISE_BT && cpe->ch[1].band_type[idx] < NOISE_BT) { | |
| 986 for (group = 0; group < ics->group_len[g]; group++) { | |
| 987 for (k = offsets[i]; k < offsets[i+1]; k++) { | |
| 988 float tmp = ch0[group*128 + k] - ch1[group*128 + k]; | |
| 989 ch0[group*128 + k] += ch1[group*128 + k]; | |
| 990 ch1[group*128 + k] = tmp; | |
| 991 } | |
| 992 } | |
| 993 } | |
| 994 } | |
| 995 ch0 += ics->group_len[g]*128; | |
| 996 ch1 += ics->group_len[g]*128; | |
| 997 } | |
| 998 } | |
| 999 | |
| 1000 /** | |
| 1001 * intensity stereo decoding; reference: 4.6.8.2.3 | |
| 1002 * | |
| 1003 * @param ms_present Indicates mid/side stereo presence. [0] mask is all 0s; | |
| 1004 * [1] mask is decoded from bitstream; [2] mask is all 1s; | |
| 1005 * [3] reserved for scalable AAC | |
| 1006 */ | |
| 1007 static void apply_intensity_stereo(ChannelElement * cpe, int ms_present) { | |
| 1008 const IndividualChannelStream * ics = &cpe->ch[1].ics; | |
| 1009 SingleChannelElement * sce1 = &cpe->ch[1]; | |
| 1010 float *coef0 = cpe->ch[0].coeffs, *coef1 = cpe->ch[1].coeffs; | |
| 1011 const uint16_t * offsets = ics->swb_offset; | |
| 1012 int g, group, i, k, idx = 0; | |
| 1013 int c; | |
| 1014 float scale; | |
| 1015 for (g = 0; g < ics->num_window_groups; g++) { | |
| 1016 for (i = 0; i < ics->max_sfb;) { | |
| 1017 if (sce1->band_type[idx] == INTENSITY_BT || sce1->band_type[idx] == INTENSITY_BT2) { | |
| 1018 const int bt_run_end = sce1->band_type_run_end[idx]; | |
| 1019 for (; i < bt_run_end; i++, idx++) { | |
| 1020 c = -1 + 2 * (sce1->band_type[idx] - 14); | |
| 1021 if (ms_present) | |
| 1022 c *= 1 - 2 * cpe->ms_mask[idx]; | |
| 1023 scale = c * sce1->sf[idx]; | |
| 1024 for (group = 0; group < ics->group_len[g]; group++) | |
| 1025 for (k = offsets[i]; k < offsets[i+1]; k++) | |
| 1026 coef1[group*128 + k] = scale * coef0[group*128 + k]; | |
| 1027 } | |
| 1028 } else { | |
| 1029 int bt_run_end = sce1->band_type_run_end[idx]; | |
| 1030 idx += bt_run_end - i; | |
| 1031 i = bt_run_end; | |
| 1032 } | |
| 1033 } | |
| 1034 coef0 += ics->group_len[g]*128; | |
| 1035 coef1 += ics->group_len[g]*128; | |
| 1036 } | |
| 1037 } | |
| 1038 | |
| 1039 /** | |
| 7539 | 1040 * Decode a channel_pair_element; reference: table 4.4. |
| 1041 * | |
| 1042 * @param elem_id Identifies the instance of a syntax element. | |
| 1043 * | |
| 1044 * @return Returns error status. 0 - OK, !0 - error | |
| 1045 */ | |
| 1046 static int decode_cpe(AACContext * ac, GetBitContext * gb, int elem_id) { | |
| 1047 int i, ret, common_window, ms_present = 0; | |
| 1048 ChannelElement * cpe; | |
| 1049 | |
| 1050 cpe = ac->che[TYPE_CPE][elem_id]; | |
| 1051 common_window = get_bits1(gb); | |
| 1052 if (common_window) { | |
| 1053 if (decode_ics_info(ac, &cpe->ch[0].ics, gb, 1)) | |
| 1054 return -1; | |
| 1055 i = cpe->ch[1].ics.use_kb_window[0]; | |
| 1056 cpe->ch[1].ics = cpe->ch[0].ics; | |
| 1057 cpe->ch[1].ics.use_kb_window[1] = i; | |
| 1058 ms_present = get_bits(gb, 2); | |
| 1059 if(ms_present == 3) { | |
| 1060 av_log(ac->avccontext, AV_LOG_ERROR, "ms_present = 3 is reserved.\n"); | |
| 1061 return -1; | |
| 1062 } else if(ms_present) | |
| 1063 decode_mid_side_stereo(cpe, gb, ms_present); | |
| 1064 } | |
| 1065 if ((ret = decode_ics(ac, &cpe->ch[0], gb, common_window, 0))) | |
| 1066 return ret; | |
| 1067 if ((ret = decode_ics(ac, &cpe->ch[1], gb, common_window, 0))) | |
| 1068 return ret; | |
| 1069 | |
| 1070 if (common_window && ms_present) | |
| 1071 apply_mid_side_stereo(cpe); | |
| 1072 | |
| 7580 | 1073 apply_intensity_stereo(cpe, ms_present); |
| 7539 | 1074 return 0; |
| 1075 } | |
| 1076 | |
| 7581 | 1077 /** |
| 1078 * Decode coupling_channel_element; reference: table 4.8. | |
| 1079 * | |
| 1080 * @param elem_id Identifies the instance of a syntax element. | |
| 1081 * | |
| 1082 * @return Returns error status. 0 - OK, !0 - error | |
| 1083 */ | |
| 1084 static int decode_cce(AACContext * ac, GetBitContext * gb, ChannelElement * che) { | |
| 1085 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
|
1086 int c, g, sfb, ret; |
| 7581 | 1087 int sign; |
| 1088 float scale; | |
| 1089 SingleChannelElement * sce = &che->ch[0]; | |
| 1090 ChannelCoupling * coup = &che->coup; | |
| 1091 | |
| 7578 | 1092 coup->coupling_point = 2*get_bits1(gb); |
| 1093 coup->num_coupled = get_bits(gb, 3); | |
| 1094 for (c = 0; c <= coup->num_coupled; c++) { | |
| 1095 num_gain++; | |
| 1096 coup->type[c] = get_bits1(gb) ? TYPE_CPE : TYPE_SCE; | |
| 1097 coup->id_select[c] = get_bits(gb, 4); | |
| 1098 if (coup->type[c] == TYPE_CPE) { | |
| 1099 coup->ch_select[c] = get_bits(gb, 2); | |
| 1100 if (coup->ch_select[c] == 3) | |
| 1101 num_gain++; | |
| 1102 } else | |
|
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1103 coup->ch_select[c] = 2; |
| 7578 | 1104 } |
| 1105 coup->coupling_point += get_bits1(gb); | |
| 1106 | |
| 1107 if (coup->coupling_point == 2) { | |
| 1108 av_log(ac->avccontext, AV_LOG_ERROR, | |
| 1109 "Independently switched CCE with 'invalid' domain signalled.\n"); | |
| 1110 memset(coup, 0, sizeof(ChannelCoupling)); | |
| 1111 return -1; | |
| 1112 } | |
| 1113 | |
| 1114 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
|
1115 scale = pow(2., pow(2., (int)get_bits(gb, 2) - 3)); |
| 7578 | 1116 |
| 1117 if ((ret = decode_ics(ac, sce, gb, 0, 0))) | |
| 1118 return ret; | |
| 1119 | |
| 1120 for (c = 0; c < num_gain; c++) { | |
|
7891
13ee9bb85721
Zero 'idx' for each iteration of the coupling gain loop and as it is only used
superdump
parents:
7890
diff
changeset
|
1121 int idx = 0; |
| 7578 | 1122 int cge = 1; |
| 1123 int gain = 0; | |
| 1124 float gain_cache = 1.; | |
| 1125 if (c) { | |
| 1126 cge = coup->coupling_point == AFTER_IMDCT ? 1 : get_bits1(gb); | |
| 1127 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
|
1128 gain_cache = pow(scale, -gain); |
| 7578 | 1129 } |
| 7890 | 1130 for (g = 0; g < sce->ics.num_window_groups; g++) { |
| 1131 for (sfb = 0; sfb < sce->ics.max_sfb; sfb++, idx++) { | |
| 7578 | 1132 if (sce->band_type[idx] != ZERO_BT) { |
| 1133 if (!cge) { | |
| 1134 int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60; | |
| 1135 if (t) { | |
| 1136 int s = 1; | |
|
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1137 t = gain += t; |
| 7578 | 1138 if (sign) { |
| 1139 s -= 2 * (t & 0x1); | |
| 1140 t >>= 1; | |
| 1141 } | |
|
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1142 gain_cache = pow(scale, -t) * s; |
| 7578 | 1143 } |
| 1144 } | |
| 1145 coup->gain[c][idx] = gain_cache; | |
| 1146 } | |
| 7890 | 1147 } |
| 1148 } | |
| 7578 | 1149 } |
| 1150 return 0; | |
| 1151 } | |
| 1152 | |
| 7539 | 1153 /** |
| 1154 * 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
|
1155 * |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1156 * @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
|
1157 * @param cnt length of TYPE_FIL syntactic element in bytes |
| 7539 | 1158 * |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1159 * @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
|
1160 */ |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1161 static int decode_sbr_extension(AACContext * ac, GetBitContext * gb, int crc, int cnt) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1162 // TODO : sbr_extension implementation |
|
8281
f93efc084e41
Make av_log_missing_feature an internal function, and change its name
stefano
parents:
8200
diff
changeset
|
1163 ff_log_missing_feature(ac->avccontext, "SBR", 0); |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1164 skip_bits_long(gb, 8*cnt - 4); // -4 due to reading extension type |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1165 return cnt; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1166 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1167 |
| 7539 | 1168 /** |
| 7578 | 1169 * Parse whether channels are to be excluded from Dynamic Range Compression; reference: table 4.53. |
| 1170 * | |
| 1171 * @return Returns number of bytes consumed. | |
| 1172 */ | |
| 1173 static int decode_drc_channel_exclusions(DynamicRangeControl *che_drc, GetBitContext * gb) { | |
| 1174 int i; | |
| 1175 int num_excl_chan = 0; | |
| 1176 | |
| 1177 do { | |
| 1178 for (i = 0; i < 7; i++) | |
| 1179 che_drc->exclude_mask[num_excl_chan++] = get_bits1(gb); | |
| 1180 } while (num_excl_chan < MAX_CHANNELS - 7 && get_bits1(gb)); | |
| 1181 | |
| 1182 return num_excl_chan / 7; | |
| 1183 } | |
| 1184 | |
| 1185 /** | |
| 7539 | 1186 * Decode dynamic range information; reference: table 4.52. |
| 1187 * | |
| 1188 * @param cnt length of TYPE_FIL syntactic element in bytes | |
| 1189 * | |
| 1190 * @return Returns number of bytes consumed. | |
| 1191 */ | |
| 1192 static int decode_dynamic_range(DynamicRangeControl *che_drc, GetBitContext * gb, int cnt) { | |
| 1193 int n = 1; | |
| 1194 int drc_num_bands = 1; | |
| 1195 int i; | |
| 1196 | |
| 1197 /* pce_tag_present? */ | |
| 1198 if(get_bits1(gb)) { | |
| 1199 che_drc->pce_instance_tag = get_bits(gb, 4); | |
| 1200 skip_bits(gb, 4); // tag_reserved_bits | |
| 1201 n++; | |
| 1202 } | |
| 1203 | |
| 1204 /* excluded_chns_present? */ | |
| 1205 if(get_bits1(gb)) { | |
| 1206 n += decode_drc_channel_exclusions(che_drc, gb); | |
| 1207 } | |
| 1208 | |
| 1209 /* drc_bands_present? */ | |
| 1210 if (get_bits1(gb)) { | |
| 1211 che_drc->band_incr = get_bits(gb, 4); | |
| 1212 che_drc->interpolation_scheme = get_bits(gb, 4); | |
| 1213 n++; | |
| 1214 drc_num_bands += che_drc->band_incr; | |
| 1215 for (i = 0; i < drc_num_bands; i++) { | |
| 1216 che_drc->band_top[i] = get_bits(gb, 8); | |
| 1217 n++; | |
| 1218 } | |
| 1219 } | |
| 1220 | |
| 1221 /* prog_ref_level_present? */ | |
| 1222 if (get_bits1(gb)) { | |
| 1223 che_drc->prog_ref_level = get_bits(gb, 7); | |
| 1224 skip_bits1(gb); // prog_ref_level_reserved_bits | |
| 1225 n++; | |
| 1226 } | |
| 1227 | |
| 1228 for (i = 0; i < drc_num_bands; i++) { | |
| 1229 che_drc->dyn_rng_sgn[i] = get_bits1(gb); | |
| 1230 che_drc->dyn_rng_ctl[i] = get_bits(gb, 7); | |
| 1231 n++; | |
| 1232 } | |
| 1233 | |
| 1234 return n; | |
| 1235 } | |
| 1236 | |
| 1237 /** | |
| 1238 * Decode extension data (incomplete); reference: table 4.51. | |
| 1239 * | |
| 1240 * @param cnt length of TYPE_FIL syntactic element in bytes | |
| 1241 * | |
| 1242 * @return Returns number of bytes consumed | |
| 1243 */ | |
| 1244 static int decode_extension_payload(AACContext * ac, GetBitContext * gb, int cnt) { | |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1245 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
|
1246 int res = cnt; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1247 switch (get_bits(gb, 4)) { // extension type |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1248 case EXT_SBR_DATA_CRC: |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1249 crc_flag++; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1250 case EXT_SBR_DATA: |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1251 res = decode_sbr_extension(ac, gb, crc_flag, cnt); |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1252 break; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1253 case EXT_DYNAMIC_RANGE: |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1254 res = decode_dynamic_range(&ac->che_drc, gb, cnt); |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1255 break; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1256 case EXT_FILL: |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1257 case EXT_FILL_DATA: |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1258 case EXT_DATA_ELEMENT: |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1259 default: |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1260 skip_bits_long(gb, 8*cnt - 4); |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1261 break; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1262 }; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1263 return res; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1264 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1265 |
|
7632
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1266 /** |
|
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1267 * 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
|
1268 * |
|
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1269 * @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
|
1270 * @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
|
1271 */ |
|
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1272 static void apply_tns(float coef[1024], TemporalNoiseShaping * tns, IndividualChannelStream * ics, int decode) { |
|
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1273 const int mmm = FFMIN(ics->tns_max_bands, ics->max_sfb); |
| 7636 | 1274 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
|
1275 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
|
1276 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
|
1277 |
|
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1278 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
|
1279 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
|
1280 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
|
1281 top = bottom; |
|
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1282 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
|
1283 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
|
1284 if (order == 0) |
|
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1285 continue; |
|
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1286 |
|
7788
ffd4b1364b62
Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
vitor
parents:
7733
diff
changeset
|
1287 // tns_decode_coef |
|
ffd4b1364b62
Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
vitor
parents:
7733
diff
changeset
|
1288 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
|
1289 |
| 7609 | 1290 start = ics->swb_offset[FFMIN(bottom, mmm)]; |
| 1291 end = ics->swb_offset[FFMIN( top, mmm)]; | |
| 1292 if ((size = end - start) <= 0) | |
| 1293 continue; | |
| 1294 if (tns->direction[w][filt]) { | |
| 1295 inc = -1; start = end - 1; | |
| 1296 } else { | |
| 1297 inc = 1; | |
| 1298 } | |
| 1299 start += w * 128; | |
| 1300 | |
| 1301 // ar filter | |
| 1302 for (m = 0; m < size; m++, start += inc) | |
| 1303 for (i = 1; i <= FFMIN(m, order); i++) | |
|
7632
ac583bd8f8b3
Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents:
7609
diff
changeset
|
1304 coef[start] -= coef[start - i*inc] * lpc[i-1]; |
| 7609 | 1305 } |
| 1306 } | |
| 1307 } | |
| 1308 | |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1309 /** |
| 7539 | 1310 * Conduct IMDCT and windowing. |
| 1311 */ | |
| 1312 static void imdct_and_windowing(AACContext * ac, SingleChannelElement * sce) { | |
| 1313 IndividualChannelStream * ics = &sce->ics; | |
| 1314 float * in = sce->coeffs; | |
| 1315 float * out = sce->ret; | |
| 1316 float * saved = sce->saved; | |
| 7580 | 1317 const float * swindow = ics->use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128; |
| 1318 const float * lwindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_long_1024 : ff_sine_1024; | |
| 1319 const float * swindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; | |
| 7539 | 1320 float * buf = ac->buf_mdct; |
|
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1321 DECLARE_ALIGNED(16, float, temp[128]); |
| 7539 | 1322 int i; |
| 1323 | |
|
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1324 // imdct |
| 7578 | 1325 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { |
| 1326 if (ics->window_sequence[1] == ONLY_LONG_SEQUENCE || ics->window_sequence[1] == LONG_STOP_SEQUENCE) | |
| 1327 av_log(ac->avccontext, AV_LOG_WARNING, | |
| 1328 "Transition from an ONLY_LONG or LONG_STOP to an EIGHT_SHORT sequence detected. " | |
| 1329 "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
|
1330 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
|
1331 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
|
1332 } else |
|
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1333 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
|
1334 |
|
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1335 /* window overlapping |
|
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1336 * 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
|
1337 * 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
|
1338 * 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
|
1339 * 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
|
1340 */ |
|
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1341 if ((ics->window_sequence[1] == ONLY_LONG_SEQUENCE || ics->window_sequence[1] == LONG_STOP_SEQUENCE) && |
|
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1342 (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
|
1343 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
|
1344 } else { |
| 7662 | 1345 for (i = 0; i < 448; i++) |
| 1346 out[i] = saved[i] + ac->add_bias; | |
| 7578 | 1347 |
|
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1348 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
|
1349 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
|
1350 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
|
1351 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
|
1352 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
|
1353 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
|
1354 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
|
1355 } else { |
|
7663
66fb1f3937fa
Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents:
7662
diff
changeset
|
1356 ac->dsp.vector_fmul_window(out + 448, saved + 448, buf, swindow_prev, ac->add_bias, 64); |
| 7662 | 1357 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
|
1358 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
|
1359 } |
|
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1360 } |
| 7578 | 1361 |
|
7661
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1362 // buffer update |
|
258eb30e6f7d
Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents:
7638
diff
changeset
|
1363 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
|
1364 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
|
1365 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
|
1366 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
|
1367 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
|
1368 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
|
1369 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
|
1370 } 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
|
1371 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
|
1372 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
|
1373 } 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
|
1374 memcpy( saved, buf + 512, 512 * sizeof(float)); |
| 7578 | 1375 } |
| 1376 } | |
| 1377 | |
| 7539 | 1378 /** |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1379 * 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
|
1380 * |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1381 * @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
|
1382 */ |
|
8006
c7c1e85d14bc
Rename variables to clarify the channel coupling element and corresponding
superdump
parents:
8004
diff
changeset
|
1383 static void apply_dependent_coupling(AACContext * ac, SingleChannelElement * target, ChannelElement * cce, int index) { |
|
c7c1e85d14bc
Rename variables to clarify the channel coupling element and corresponding
superdump
parents:
8004
diff
changeset
|
1384 IndividualChannelStream * ics = &cce->ch[0].ics; |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1385 const uint16_t * offsets = ics->swb_offset; |
|
8006
c7c1e85d14bc
Rename variables to clarify the channel coupling element and corresponding
superdump
parents:
8004
diff
changeset
|
1386 float * dest = target->coeffs; |
|
c7c1e85d14bc
Rename variables to clarify the channel coupling element and corresponding
superdump
parents:
8004
diff
changeset
|
1387 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
|
1388 int g, i, group, k, idx = 0; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1389 if(ac->m4ac.object_type == AOT_AAC_LTP) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1390 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
|
1391 "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
|
1392 return; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1393 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1394 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
|
1395 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
|
1396 if (cce->ch[0].band_type[idx] != ZERO_BT) { |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1397 for (group = 0; group < ics->group_len[g]; group++) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1398 for (k = offsets[i]; k < offsets[i+1]; k++) { |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1399 // XXX dsputil-ize |
|
8006
c7c1e85d14bc
Rename variables to clarify the channel coupling element and corresponding
superdump
parents:
8004
diff
changeset
|
1400 dest[group*128+k] += cce->coup.gain[index][idx] * 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
|
1401 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1402 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1403 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1404 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1405 dest += ics->group_len[g]*128; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1406 src += ics->group_len[g]*128; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1407 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1408 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1409 |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1410 /** |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1411 * 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
|
1412 * |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1413 * @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
|
1414 */ |
|
8006
c7c1e85d14bc
Rename variables to clarify the channel coupling element and corresponding
superdump
parents:
8004
diff
changeset
|
1415 static void apply_independent_coupling(AACContext * ac, SingleChannelElement * target, ChannelElement * cce, int index) { |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1416 int i; |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1417 for (i = 0; i < 1024; i++) |
|
8006
c7c1e85d14bc
Rename variables to clarify the channel coupling element and corresponding
superdump
parents:
8004
diff
changeset
|
1418 target->ret[i] += cce->coup.gain[index][0] * (cce->ch[0].ret[i] - ac->add_bias); |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1419 } |
|
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1420 |
| 7581 | 1421 /** |
| 1422 * channel coupling transformation interface | |
| 1423 * | |
| 1424 * @param index index into coupling gain array | |
| 1425 * @param apply_coupling_method pointer to (in)dependent coupling function | |
| 1426 */ | |
| 1427 static void apply_channel_coupling(AACContext * ac, ChannelElement * cc, | |
|
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1428 enum RawDataBlockType type, int elem_id, enum CouplingPoint coupling_point, |
|
8006
c7c1e85d14bc
Rename variables to clarify the channel coupling element and corresponding
superdump
parents:
8004
diff
changeset
|
1429 void (*apply_coupling_method)(AACContext * ac, SingleChannelElement * target, ChannelElement * cce, int index)) |
| 7581 | 1430 { |
|
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1431 int i, c; |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1432 |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1433 for (i = 0; i < MAX_ELEM_ID; i++) { |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1434 ChannelElement *cce = ac->che[TYPE_CCE][i]; |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1435 int index = 0; |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1436 |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1437 if (cce && cce->coup.coupling_point == coupling_point) { |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1438 ChannelCoupling * coup = &cce->coup; |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1439 |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1440 for (c = 0; c <= coup->num_coupled; c++) { |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1441 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
|
1442 if (coup->ch_select[c] != 1) { |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1443 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
|
1444 if (coup->ch_select[c] != 0) |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1445 index++; |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1446 } |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1447 if (coup->ch_select[c] != 2) |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1448 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
|
1449 } else |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1450 index += 1 + (coup->ch_select[c] == 3); |
| 7581 | 1451 } |
| 1452 } | |
| 1453 } | |
| 1454 } | |
| 1455 | |
| 1456 /** | |
| 1457 * Convert spectral data to float samples, applying all supported tools as appropriate. | |
| 1458 */ | |
| 1459 static void spectral_to_sample(AACContext * ac) { | |
| 1460 int i, type; | |
|
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1461 for(type = 3; type >= 0; type--) { |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1462 for (i = 0; i < MAX_ELEM_ID; i++) { |
| 7581 | 1463 ChannelElement *che = ac->che[type][i]; |
| 1464 if(che) { | |
|
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1465 if(type <= TYPE_CPE) |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1466 apply_channel_coupling(ac, che, type, i, BEFORE_TNS, apply_dependent_coupling); |
| 7581 | 1467 if(che->ch[0].tns.present) |
| 1468 apply_tns(che->ch[0].coeffs, &che->ch[0].tns, &che->ch[0].ics, 1); | |
| 1469 if(che->ch[1].tns.present) | |
| 1470 apply_tns(che->ch[1].coeffs, &che->ch[1].tns, &che->ch[1].ics, 1); | |
|
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1471 if(type <= TYPE_CPE) |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1472 apply_channel_coupling(ac, che, type, i, BETWEEN_TNS_AND_IMDCT, apply_dependent_coupling); |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1473 if(type != TYPE_CCE || che->coup.coupling_point == AFTER_IMDCT) |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1474 imdct_and_windowing(ac, &che->ch[0]); |
| 7581 | 1475 if(type == TYPE_CPE) |
| 1476 imdct_and_windowing(ac, &che->ch[1]); | |
|
8004
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1477 if(type <= TYPE_CCE) |
|
8fd8f23be794
Corrections to channel coupling code to attain conformance for appropriate
superdump
parents:
7891
diff
changeset
|
1478 apply_channel_coupling(ac, che, type, i, AFTER_IMDCT, apply_independent_coupling); |
| 7578 | 1479 } |
| 1480 } | |
| 1481 } | |
| 1482 } | |
| 1483 | |
| 1484 static int aac_decode_frame(AVCodecContext * avccontext, void * data, int * data_size, const uint8_t * buf, int buf_size) { | |
| 1485 AACContext * ac = avccontext->priv_data; | |
| 1486 GetBitContext gb; | |
| 1487 enum RawDataBlockType elem_type; | |
| 1488 int err, elem_id, data_size_tmp; | |
| 1489 | |
| 1490 init_get_bits(&gb, buf, buf_size*8); | |
| 1491 | |
| 1492 // parse | |
| 1493 while ((elem_type = get_bits(&gb, 3)) != TYPE_END) { | |
| 1494 elem_id = get_bits(&gb, 4); | |
| 1495 err = -1; | |
| 1496 | |
| 1497 if(elem_type == TYPE_SCE && elem_id == 1 && | |
| 1498 !ac->che[TYPE_SCE][elem_id] && ac->che[TYPE_LFE][0]) { | |
| 1499 /* Some streams incorrectly code 5.1 audio as SCE[0] CPE[0] CPE[1] SCE[1] | |
| 1500 instead of SCE[0] CPE[0] CPE[0] LFE[0]. If we seem to have | |
| 1501 encountered such a stream, transfer the LFE[0] element to SCE[1] */ | |
| 1502 ac->che[TYPE_SCE][elem_id] = ac->che[TYPE_LFE][0]; | |
| 1503 ac->che[TYPE_LFE][0] = NULL; | |
| 1504 } | |
|
7732
5d93ceaa7a2c
Remove unnecessary portion of a condition. This fixes issue607 and avoids
superdump
parents:
7663
diff
changeset
|
1505 if(elem_type < TYPE_DSE) { |
| 7578 | 1506 if(!ac->che[elem_type][elem_id]) |
| 1507 return -1; | |
| 1508 if(elem_type != TYPE_CCE) | |
| 1509 ac->che[elem_type][elem_id]->coup.coupling_point = 4; | |
| 1510 } | |
| 1511 | |
| 1512 switch (elem_type) { | |
| 1513 | |
| 1514 case TYPE_SCE: | |
| 1515 err = decode_ics(ac, &ac->che[TYPE_SCE][elem_id]->ch[0], &gb, 0, 0); | |
| 1516 break; | |
| 1517 | |
| 1518 case TYPE_CPE: | |
| 1519 err = decode_cpe(ac, &gb, elem_id); | |
| 1520 break; | |
| 1521 | |
| 1522 case TYPE_CCE: | |
| 7733 | 1523 err = decode_cce(ac, &gb, ac->che[TYPE_CCE][elem_id]); |
| 7578 | 1524 break; |
| 1525 | |
| 1526 case TYPE_LFE: | |
| 1527 err = decode_ics(ac, &ac->che[TYPE_LFE][elem_id]->ch[0], &gb, 0, 0); | |
| 1528 break; | |
| 1529 | |
| 1530 case TYPE_DSE: | |
| 1531 skip_data_stream_element(&gb); | |
| 1532 err = 0; | |
| 1533 break; | |
| 1534 | |
| 1535 case TYPE_PCE: | |
| 1536 { | |
| 1537 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID]; | |
| 1538 memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])); | |
| 1539 if((err = decode_pce(ac, new_che_pos, &gb))) | |
| 1540 break; | |
| 1541 err = output_configure(ac, ac->che_pos, new_che_pos); | |
| 1542 break; | |
| 1543 } | |
| 1544 | |
| 1545 case TYPE_FIL: | |
| 1546 if (elem_id == 15) | |
| 1547 elem_id += get_bits(&gb, 8) - 1; | |
| 1548 while (elem_id > 0) | |
| 1549 elem_id -= decode_extension_payload(ac, &gb, elem_id); | |
| 1550 err = 0; /* FIXME */ | |
| 1551 break; | |
| 1552 | |
| 1553 default: | |
| 1554 err = -1; /* should not happen, but keeps compiler happy */ | |
| 1555 break; | |
| 1556 } | |
| 1557 | |
| 1558 if(err) | |
| 1559 return err; | |
| 1560 } | |
| 1561 | |
| 1562 spectral_to_sample(ac); | |
| 1563 | |
| 7539 | 1564 if (!ac->is_saved) { |
| 1565 ac->is_saved = 1; | |
| 1566 *data_size = 0; | |
| 7580 | 1567 return buf_size; |
| 7539 | 1568 } |
| 1569 | |
| 1570 data_size_tmp = 1024 * avccontext->channels * sizeof(int16_t); | |
| 1571 if(*data_size < data_size_tmp) { | |
| 1572 av_log(avccontext, AV_LOG_ERROR, | |
| 1573 "Output buffer too small (%d) or trying to output too many samples (%d) for this frame.\n", | |
| 1574 *data_size, data_size_tmp); | |
| 1575 return -1; | |
| 1576 } | |
| 1577 *data_size = data_size_tmp; | |
| 1578 | |
| 1579 ac->dsp.float_to_int16_interleave(data, (const float **)ac->output_data, 1024, avccontext->channels); | |
| 1580 | |
| 1581 return buf_size; | |
| 1582 } | |
| 1583 | |
| 7501 | 1584 static av_cold int aac_decode_close(AVCodecContext * avccontext) { |
| 1585 AACContext * ac = avccontext->priv_data; | |
| 7540 | 1586 int i, type; |
| 7501 | 1587 |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1588 for (i = 0; i < MAX_ELEM_ID; i++) { |
| 7540 | 1589 for(type = 0; type < 4; type++) |
| 1590 av_freep(&ac->che[type][i]); | |
| 7501 | 1591 } |
| 1592 | |
| 1593 ff_mdct_end(&ac->mdct); | |
| 1594 ff_mdct_end(&ac->mdct_small); | |
| 1595 return 0 ; | |
| 1596 } | |
| 1597 | |
| 1598 AVCodec aac_decoder = { | |
| 1599 "aac", | |
| 1600 CODEC_TYPE_AUDIO, | |
| 1601 CODEC_ID_AAC, | |
| 1602 sizeof(AACContext), | |
| 1603 aac_decode_init, | |
| 1604 NULL, | |
| 1605 aac_decode_close, | |
| 1606 aac_decode_frame, | |
| 1607 .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), | |
|
7523
a3f7ffdb676d
Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents:
7501
diff
changeset
|
1608 .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, |
| 7501 | 1609 }; |
