annotate aac.c @ 8520:a0164882aa38 libavcodec

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