annotate aac.c @ 11560:8a4984c5cacc libavcodec

Define AVMediaType enum, and use it instead of enum CodecType, which is deprecated and will be dropped at the next major bump.
author stefano
date Tue, 30 Mar 2010 23:30:55 +0000
parents 1aba21918874
children 7dd2a45249a9
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 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8590
diff changeset
24 * @file libavcodec/aac.c
7501
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
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
65 * Y Spectral Band Replication
7501
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"
9428
0dce4fe6e6f3 Rename bitstream.h to get_bits.h.
stefano
parents: 9355
diff changeset
81 #include "get_bits.h"
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
82 #include "dsputil.h"
11370
4b3da727d832 Move FFT parts from dsputil.h to fft.h
mru
parents: 11362
diff changeset
83 #include "fft.h"
7788
ffd4b1364b62 Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
vitor
parents: 7733
diff changeset
84 #include "lpc.h"
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
85
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
86 #include "aac.h"
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
87 #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
88 #include "aacdectab.h"
11489
1aba21918874 Allow hard-coding of the 32kB cubic-root table for AAC.
reimar
parents: 11481
diff changeset
89 #include "cbrt_tablegen.h"
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
90 #include "sbr.h"
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
91 #include "aacsbr.h"
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
92 #include "mpeg4audio.h"
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
93 #include "aac_parser.h"
7501
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 #include <assert.h>
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
96 #include <errno.h>
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
97 #include <math.h>
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
98 #include <string.h>
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
99
10881
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
100 #if ARCH_ARM
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
101 # include "arm/aac.h"
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
102 #endif
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
103
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
104 union float754 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
105 float f;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
106 uint32_t i;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
107 };
9179
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
108
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
109 static VLC vlc_scalefactors;
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
110 static VLC vlc_spectral[11];
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
111
11205
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
112 static const char overread_err[] = "Input buffer exhausted before END element found\n";
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
113
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
114 static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
115 {
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
116 if (ac->tag_che_map[type][elem_id]) {
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
117 return ac->tag_che_map[type][elem_id];
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
118 }
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
119 if (ac->tags_mapped >= tags_per_config[ac->m4ac.chan_config]) {
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
120 return NULL;
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
121 }
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
122 switch (ac->m4ac.chan_config) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
123 case 7:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
124 if (ac->tags_mapped == 3 && type == TYPE_CPE) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
125 ac->tags_mapped++;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
126 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][2];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
127 }
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
128 case 6:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
129 /* Some streams incorrectly code 5.1 audio as SCE[0] CPE[0] CPE[1] SCE[1]
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
130 instead of SCE[0] CPE[0] CPE[0] LFE[0]. If we seem to have
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
131 encountered such a stream, transfer the LFE[0] element to SCE[1] */
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
132 if (ac->tags_mapped == tags_per_config[ac->m4ac.chan_config] - 1 && (type == TYPE_LFE || type == TYPE_SCE)) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
133 ac->tags_mapped++;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
134 return ac->tag_che_map[type][elem_id] = ac->che[TYPE_LFE][0];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
135 }
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
136 case 5:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
137 if (ac->tags_mapped == 2 && type == TYPE_CPE) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
138 ac->tags_mapped++;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
139 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][1];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
140 }
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
141 case 4:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
142 if (ac->tags_mapped == 2 && ac->m4ac.chan_config == 4 && type == TYPE_SCE) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
143 ac->tags_mapped++;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
144 return ac->tag_che_map[TYPE_SCE][elem_id] = ac->che[TYPE_SCE][1];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
145 }
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
146 case 3:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
147 case 2:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
148 if (ac->tags_mapped == (ac->m4ac.chan_config != 2) && type == TYPE_CPE) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
149 ac->tags_mapped++;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
150 return ac->tag_che_map[TYPE_CPE][elem_id] = ac->che[TYPE_CPE][0];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
151 } else if (ac->m4ac.chan_config == 2) {
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
152 return NULL;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
153 }
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
154 case 1:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
155 if (!ac->tags_mapped && type == TYPE_SCE) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
156 ac->tags_mapped++;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
157 return ac->tag_che_map[TYPE_SCE][elem_id] = ac->che[TYPE_SCE][0];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
158 }
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
159 default:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
160 return NULL;
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
161 }
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
162 }
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
163
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
164 /**
10308
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
165 * Check for the channel element in the current channel position configuration.
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
166 * If it exists, make sure the appropriate element is allocated and map the
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
167 * channel order to match the internal FFmpeg channel layout.
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
168 *
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
169 * @param che_pos current channel position configuration
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
170 * @param type channel element type
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
171 * @param id channel element id
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
172 * @param channels count of the number of channels in the configuration
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
173 *
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
174 * @return Returns error status. 0 - OK, !0 - error
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
175 */
11177
69020e1846fe AAC: Mark che_configure() as av_cold.
alexc
parents: 11176
diff changeset
176 static av_cold int che_configure(AACContext *ac,
10308
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
177 enum ChannelPosition che_pos[4][MAX_ELEM_ID],
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
178 int type, int id,
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
179 int *channels)
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
180 {
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
181 if (che_pos[type][id]) {
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
182 if (!ac->che[type][id] && !(ac->che[type][id] = av_mallocz(sizeof(ChannelElement))))
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
183 return AVERROR(ENOMEM);
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
184 ff_aac_sbr_ctx_init(&ac->che[type][id]->sbr);
10308
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
185 if (type != TYPE_CCE) {
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
186 ac->output_data[(*channels)++] = ac->che[type][id]->ch[0].ret;
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
187 if (type == TYPE_CPE) {
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
188 ac->output_data[(*channels)++] = ac->che[type][id]->ch[1].ret;
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
189 }
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
190 }
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
191 } else {
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
192 if (ac->che[type][id])
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
193 ff_aac_sbr_ctx_close(&ac->che[type][id]->sbr);
10308
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
194 av_freep(&ac->che[type][id]);
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
195 }
10308
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
196 return 0;
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
197 }
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
198
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
199 /**
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
200 * Configure output channel order based on the current program configuration element.
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
201 *
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
202 * @param che_pos current channel position configuration
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
203 * @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
204 *
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
205 * @return Returns error status. 0 - OK, !0 - error
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
206 */
11176
490544c08c48 AAC: Mark functions that are only called when the output configuration is not locked as av_cold.
alexc
parents: 11119
diff changeset
207 static av_cold int output_configure(AACContext *ac,
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
208 enum ChannelPosition che_pos[4][MAX_ELEM_ID],
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
209 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID],
10491
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
210 int channel_config, enum OCStatus oc_type)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
211 {
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
212 AVCodecContext *avctx = ac->avccontext;
10308
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
213 int i, type, channels = 0, ret;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
214
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
215 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
216
10306
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
217 if (channel_config) {
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
218 for (i = 0; i < tags_per_config[channel_config]; i++) {
10308
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
219 if ((ret = che_configure(ac, che_pos,
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
220 aac_channel_layout_map[channel_config - 1][i][0],
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
221 aac_channel_layout_map[channel_config - 1][i][1],
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
222 &channels)))
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
223 return ret;
10306
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
224 }
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
225
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
226 memset(ac->tag_che_map, 0, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
227 ac->tags_mapped = 0;
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
228
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
229 avctx->channel_layout = aac_channel_layout[channel_config - 1];
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
230 } else {
10307
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
231 /* Allocate or free elements depending on if they are in the
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
232 * current program configuration.
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
233 *
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
234 * Set up default 1:1 output mapping.
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
235 *
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
236 * For a 5.1 stream the output order will be:
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
237 * [ Center ] [ Front Left ] [ Front Right ] [ LFE ] [ Surround Left ] [ Surround Right ]
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
238 */
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
239
10307
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
240 for (i = 0; i < MAX_ELEM_ID; i++) {
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
241 for (type = 0; type < 4; type++) {
10308
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
242 if ((ret = che_configure(ac, che_pos, type, i, &channels)))
28b0f87cfdf1 Refactor channel element configuration and mapping code into its own function
superdump
parents: 10307
diff changeset
243 return ret;
10307
4e1d3e37bba0 Reindent after last commit
superdump
parents: 10306
diff changeset
244 }
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
245 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
246
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
247 memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0]));
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
248 ac->tags_mapped = 4 * MAX_ELEM_ID;
10306
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
249
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
250 avctx->channel_layout = 0;
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
251 }
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
252
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
253 avctx->channels = channels;
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
254
10491
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
255 ac->output_configured = oc_type;
9948
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
256
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
257 return 0;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
258 }
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 /**
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
261 * 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
262 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
263 * @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
264 * @param sce_map mono (Single Channel Element) map
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
265 * @param type speaker type/position for these channels
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
266 */
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
267 static void decode_channel_map(enum ChannelPosition *cpe_map,
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
268 enum ChannelPosition *sce_map,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
269 enum ChannelPosition type,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
270 GetBitContext *gb, int n)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
271 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
272 while (n--) {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
273 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
274 map[get_bits(gb, 4)] = type;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
275 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
276 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
277
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 * Decode program configuration element; reference: table 4.2.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
280 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
281 * @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
282 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
283 * @return Returns error status. 0 - OK, !0 - error
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
284 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
285 static int decode_pce(AACContext *ac, enum ChannelPosition new_che_pos[4][MAX_ELEM_ID],
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
286 GetBitContext *gb)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
287 {
8412
2d48043ab521 AAC: Don't write an illegal sampling_index in a PCE to the MPEG4AudioConfig
superdump
parents: 8286
diff changeset
288 int num_front, num_side, num_back, num_lfe, num_assoc_data, num_cc, sampling_index;
11205
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
289 int comment_len;
7539
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 skip_bits(gb, 2); // object_type
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
292
8412
2d48043ab521 AAC: Don't write an illegal sampling_index in a PCE to the MPEG4AudioConfig
superdump
parents: 8286
diff changeset
293 sampling_index = get_bits(gb, 4);
9716
d45e44454d13 In the event of a mismatch, do not follow the sample rate index in an AAC PCE.
alexc
parents: 9658
diff changeset
294 if (ac->m4ac.sampling_index != sampling_index)
d45e44454d13 In the event of a mismatch, do not follow the sample rate index in an AAC PCE.
alexc
parents: 9658
diff changeset
295 av_log(ac->avccontext, AV_LOG_WARNING, "Sample rate index in program config element does not match the sample rate index configured by the container.\n");
d45e44454d13 In the event of a mismatch, do not follow the sample rate index in an AAC PCE.
alexc
parents: 9658
diff changeset
296
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
297 num_front = get_bits(gb, 4);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
298 num_side = get_bits(gb, 4);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
299 num_back = get_bits(gb, 4);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
300 num_lfe = get_bits(gb, 2);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
301 num_assoc_data = get_bits(gb, 3);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
302 num_cc = get_bits(gb, 4);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
303
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
304 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
305 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
306 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
307 skip_bits(gb, 4); // stereo_mixdown_tag
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
308
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
309 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
310 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
311
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
312 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
313 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
314 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
315 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
316
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
317 skip_bits_long(gb, 4 * num_assoc_data);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
318
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
319 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
320
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
321 align_get_bits(gb);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
322
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
323 /* comment field, first byte is length */
11205
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
324 comment_len = get_bits(gb, 8) * 8;
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
325 if (get_bits_left(gb) < comment_len) {
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
326 av_log(ac->avccontext, AV_LOG_ERROR, overread_err);
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
327 return -1;
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
328 }
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
329 skip_bits_long(gb, comment_len);
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
330 return 0;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
331 }
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
332
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
333 /**
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
334 * 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
335 * as specified in table 1.17.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
336 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
337 * @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
338 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
339 * @return Returns error status. 0 - OK, !0 - error
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
340 */
11176
490544c08c48 AAC: Mark functions that are only called when the output configuration is not locked as av_cold.
alexc
parents: 11119
diff changeset
341 static av_cold int set_default_channel_config(AACContext *ac,
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
342 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID],
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
343 int channel_config)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
344 {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
345 if (channel_config < 1 || channel_config > 7) {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
346 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
347 channel_config);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
348 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
349 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
350
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
351 /* default channel configurations:
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
352 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
353 * 1ch : front center (mono)
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
354 * 2ch : L + R (stereo)
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
355 * 3ch : front center + L + R
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
356 * 4ch : front center + L + R + back center
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
357 * 5ch : front center + L + R + back stereo
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
358 * 6ch : front center + L + R + back stereo + LFE
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
359 * 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
360 */
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
361
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
362 if (channel_config != 2)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
363 new_che_pos[TYPE_SCE][0] = AAC_CHANNEL_FRONT; // front center (or mono)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
364 if (channel_config > 1)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
365 new_che_pos[TYPE_CPE][0] = AAC_CHANNEL_FRONT; // L + R (or stereo)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
366 if (channel_config == 4)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
367 new_che_pos[TYPE_SCE][1] = AAC_CHANNEL_BACK; // back center
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
368 if (channel_config > 4)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
369 new_che_pos[TYPE_CPE][(channel_config == 7) + 1]
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
370 = AAC_CHANNEL_BACK; // back stereo
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
371 if (channel_config > 5)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
372 new_che_pos[TYPE_LFE][0] = AAC_CHANNEL_LFE; // LFE
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
373 if (channel_config == 7)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
374 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
375
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
376 return 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
377 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
378
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
379 /**
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
380 * Decode GA "General Audio" specific configuration; reference: table 4.1.
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
381 *
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
382 * @return Returns error status. 0 - OK, !0 - error
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
383 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
384 static int decode_ga_specific_config(AACContext *ac, GetBitContext *gb,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
385 int channel_config)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
386 {
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
387 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID];
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
388 int extension_flag, ret;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
389
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
390 if (get_bits1(gb)) { // frameLengthFlag
9891
7ad7d4094d1f Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents: 9847
diff changeset
391 av_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
392 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
393 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
394
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
395 if (get_bits1(gb)) // dependsOnCoreCoder
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
396 skip_bits(gb, 14); // coreCoderDelay
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
397 extension_flag = get_bits1(gb);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
398
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
399 if (ac->m4ac.object_type == AOT_AAC_SCALABLE ||
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
400 ac->m4ac.object_type == AOT_ER_AAC_SCALABLE)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
401 skip_bits(gb, 3); // layerNr
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
402
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
403 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
404 if (channel_config == 0) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
405 skip_bits(gb, 4); // element_instance_tag
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
406 if ((ret = decode_pce(ac, new_che_pos, gb)))
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
407 return ret;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
408 } else {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
409 if ((ret = set_default_channel_config(ac, new_che_pos, channel_config)))
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
410 return ret;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
411 }
10622
2474aceea736 AAC: Add a global header but output not locked output configuration status.
alexc
parents: 10621
diff changeset
412 if ((ret = output_configure(ac, ac->che_pos, new_che_pos, channel_config, OC_GLOBAL_HDR)))
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
413 return ret;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
414
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
415 if (extension_flag) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
416 switch (ac->m4ac.object_type) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
417 case AOT_ER_BSAC:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
418 skip_bits(gb, 5); // numOfSubFrame
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
419 skip_bits(gb, 11); // layer_length
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
420 break;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
421 case AOT_ER_AAC_LC:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
422 case AOT_ER_AAC_LTP:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
423 case AOT_ER_AAC_SCALABLE:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
424 case AOT_ER_AAC_LD:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
425 skip_bits(gb, 3); /* aacSectionDataResilienceFlag
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
426 * aacScalefactorDataResilienceFlag
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
427 * aacSpectralDataResilienceFlag
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
428 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
429 break;
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
430 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
431 skip_bits1(gb); // extensionFlag3 (TBD in version 3)
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
432 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
433 return 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
434 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
435
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
436 /**
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
437 * Decode audio specific configuration; reference: table 1.13.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
438 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
439 * @param data pointer to AVCodecContext extradata
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
440 * @param data_size size of AVCCodecContext extradata
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
441 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
442 * @return Returns error status. 0 - OK, !0 - error
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
443 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
444 static int decode_audio_specific_config(AACContext *ac, void *data,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
445 int data_size)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
446 {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
447 GetBitContext gb;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
448 int i;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
449
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
450 init_get_bits(&gb, data, data_size * 8);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
451
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
452 if ((i = ff_mpeg4audio_get_config(&ac->m4ac, data, data_size)) < 0)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
453 return -1;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
454 if (ac->m4ac.sampling_index > 12) {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
455 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
456 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
457 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
458
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
459 skip_bits_long(&gb, i);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
460
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
461 switch (ac->m4ac.object_type) {
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
462 case AOT_AAC_MAIN:
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
463 case AOT_AAC_LC:
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
464 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
465 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
466 break;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
467 default:
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
468 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
469 ac->m4ac.sbr == 1? "SBR+" : "", ac->m4ac.object_type);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
470 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
471 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
472 return 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
473 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
474
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
475 /**
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
476 * linear congruential pseudorandom number generator
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
477 *
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
478 * @param previous_val pointer to the current state of the generator
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
479 *
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
480 * @return Returns a 32-bit pseudorandom integer
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
481 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
482 static av_always_inline int lcg_random(int previous_val)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
483 {
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
484 return previous_val * 1664525 + 1013904223;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
485 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
486
11358
a1376a6f9af1 AAC: Mark predictor functions av_always_inline.
alexc
parents: 11281
diff changeset
487 static av_always_inline void reset_predict_state(PredictorState *ps)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
488 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
489 ps->r0 = 0.0f;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
490 ps->r1 = 0.0f;
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
491 ps->cor0 = 0.0f;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
492 ps->cor1 = 0.0f;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
493 ps->var0 = 1.0f;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
494 ps->var1 = 1.0f;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
495 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
496
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
497 static void reset_all_predictors(PredictorState *ps)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
498 {
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
499 int i;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
500 for (i = 0; i < MAX_PREDICTORS; i++)
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
501 reset_predict_state(&ps[i]);
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
502 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
503
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
504 static void reset_predictor_group(PredictorState *ps, int group_num)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
505 {
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
506 int i;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
507 for (i = group_num - 1; i < MAX_PREDICTORS; i += 30)
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
508 reset_predict_state(&ps[i]);
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
509 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
510
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
511 static av_cold int aac_decode_init(AVCodecContext *avccontext)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
512 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
513 AACContext *ac = avccontext->priv_data;
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
514 int i;
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
515
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
516 ac->avccontext = avccontext;
11393
d23864bc3887 AAC: Set codec parameters in the first frame rather than in .init()
alexc
parents: 11388
diff changeset
517 ac->m4ac.sample_rate = avccontext->sample_rate;
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
518
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
519 if (avccontext->extradata_size > 0) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
520 if (decode_audio_specific_config(ac, avccontext->extradata, avccontext->extradata_size))
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
521 return -1;
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
522 }
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
523
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
524 avccontext->sample_fmt = SAMPLE_FMT_S16;
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
525
10877
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
526 AAC_INIT_VLC_STATIC( 0, 304);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
527 AAC_INIT_VLC_STATIC( 1, 270);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
528 AAC_INIT_VLC_STATIC( 2, 550);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
529 AAC_INIT_VLC_STATIC( 3, 300);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
530 AAC_INIT_VLC_STATIC( 4, 328);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
531 AAC_INIT_VLC_STATIC( 5, 294);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
532 AAC_INIT_VLC_STATIC( 6, 306);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
533 AAC_INIT_VLC_STATIC( 7, 268);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
534 AAC_INIT_VLC_STATIC( 8, 510);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
535 AAC_INIT_VLC_STATIC( 9, 366);
9ad6c1c4455c AAC: Reduce depth of vlc_spectral tables to 2
mru
parents: 10876
diff changeset
536 AAC_INIT_VLC_STATIC(10, 462);
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
537
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
538 ff_aac_sbr_init();
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
539
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
540 dsputil_init(&ac->dsp, avccontext);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
541
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
542 ac->random_state = 0x1f2e3d4c;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
543
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
544 // -1024 - Compensate wrong IMDCT method.
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
545 // 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
546 // for float to int16 conversion.
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
547
10377
98816e4d5522 dca and aac decoders use float_to_int16_interleave, so check for
conrad
parents: 10308
diff changeset
548 if (ac->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
549 ac->add_bias = 385.0f;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
550 ac->sf_scale = 1. / (-1024. * 32768.);
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
551 ac->sf_offset = 0;
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
552 } else {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
553 ac->add_bias = 0.0f;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
554 ac->sf_scale = 1. / -1024.;
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
555 ac->sf_offset = 60;
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
556 }
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
557
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8549
diff changeset
558 #if !CONFIG_HARDCODED_TABLES
8109
7baa25290231 Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents: 8042
diff changeset
559 for (i = 0; i < 428; i++)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
560 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
561 #endif /* CONFIG_HARDCODED_TABLES */
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
562
8042
e70975d5ff80 uses FF_ARRAY_ELEMS() where appropriate
aurel
parents: 8006
diff changeset
563 INIT_VLC_STATIC(&vlc_scalefactors,7,FF_ARRAY_ELEMS(ff_aac_scalefactor_code),
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
564 ff_aac_scalefactor_bits, sizeof(ff_aac_scalefactor_bits[0]), sizeof(ff_aac_scalefactor_bits[0]),
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
565 ff_aac_scalefactor_code, sizeof(ff_aac_scalefactor_code[0]), sizeof(ff_aac_scalefactor_code[0]),
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
566 352);
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
567
9658
67a20f0eb42c Support for getting (i)MDCT output multiplied by a constant scaling factor.
serge
parents: 9634
diff changeset
568 ff_mdct_init(&ac->mdct, 11, 1, 1.0);
67a20f0eb42c Support for getting (i)MDCT output multiplied by a constant scaling factor.
serge
parents: 9634
diff changeset
569 ff_mdct_init(&ac->mdct_small, 8, 1, 1.0);
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
570 // window initialization
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
571 ff_kbd_window_init(ff_aac_kbd_long_1024, 4.0, 1024);
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
572 ff_kbd_window_init(ff_aac_kbd_short_128, 6.0, 128);
10827
3d011a01a6a0 Add support for hard-coded MDCT-related ff_sine_windows tables.
reimar
parents: 10819
diff changeset
573 ff_init_ff_sine_windows(10);
3d011a01a6a0 Add support for hard-coded MDCT-related ff_sine_windows tables.
reimar
parents: 10819
diff changeset
574 ff_init_ff_sine_windows( 7);
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
575
11489
1aba21918874 Allow hard-coding of the 32kB cubic-root table for AAC.
reimar
parents: 11481
diff changeset
576 cbrt_tableinit();
10849
e8f4b9e41b7a AAC: use table for cbrtf(n)*n
mru
parents: 10848
diff changeset
577
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
578 return 0;
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
579 }
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
580
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
581 /**
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
582 * Skip data_stream_element; reference: table 4.10.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
583 */
11205
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
584 static int skip_data_stream_element(AACContext *ac, GetBitContext *gb)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
585 {
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
586 int byte_align = get_bits1(gb);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
587 int count = get_bits(gb, 8);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
588 if (count == 255)
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
589 count += get_bits(gb, 8);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
590 if (byte_align)
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
591 align_get_bits(gb);
11205
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
592
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
593 if (get_bits_left(gb) < 8 * count) {
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
594 av_log(ac->avccontext, AV_LOG_ERROR, overread_err);
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
595 return -1;
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
596 }
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
597 skip_bits_long(gb, 8 * count);
11205
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
598 return 0;
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
599 }
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
600
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
601 static int decode_prediction(AACContext *ac, IndividualChannelStream *ics,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
602 GetBitContext *gb)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
603 {
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
604 int sfb;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
605 if (get_bits1(gb)) {
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
606 ics->predictor_reset_group = get_bits(gb, 5);
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
607 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
608 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
609 return -1;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
610 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
611 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
612 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
613 ics->prediction_used[sfb] = get_bits1(gb);
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
614 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
615 return 0;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
616 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
617
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
618 /**
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
619 * Decode Individual Channel Stream info; reference: table 4.6.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
620 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
621 * @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
622 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
623 static int decode_ics_info(AACContext *ac, IndividualChannelStream *ics,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
624 GetBitContext *gb, int common_window)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
625 {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
626 if (get_bits1(gb)) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
627 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
628 memset(ics, 0, sizeof(IndividualChannelStream));
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
629 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
630 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
631 ics->window_sequence[1] = ics->window_sequence[0];
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
632 ics->window_sequence[0] = get_bits(gb, 2);
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
633 ics->use_kb_window[1] = ics->use_kb_window[0];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
634 ics->use_kb_window[0] = get_bits1(gb);
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
635 ics->num_window_groups = 1;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
636 ics->group_len[0] = 1;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
637 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
638 int i;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
639 ics->max_sfb = get_bits(gb, 4);
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
640 for (i = 0; i < 7; i++) {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
641 if (get_bits1(gb)) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
642 ics->group_len[ics->num_window_groups - 1]++;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
643 } else {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
644 ics->num_window_groups++;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
645 ics->group_len[ics->num_window_groups - 1] = 1;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
646 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
647 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
648 ics->num_windows = 8;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
649 ics->swb_offset = ff_swb_offset_128[ac->m4ac.sampling_index];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
650 ics->num_swb = ff_aac_num_swb_128[ac->m4ac.sampling_index];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
651 ics->tns_max_bands = ff_tns_max_bands_128[ac->m4ac.sampling_index];
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
652 ics->predictor_present = 0;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
653 } else {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
654 ics->max_sfb = get_bits(gb, 6);
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
655 ics->num_windows = 1;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
656 ics->swb_offset = ff_swb_offset_1024[ac->m4ac.sampling_index];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
657 ics->num_swb = ff_aac_num_swb_1024[ac->m4ac.sampling_index];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
658 ics->tns_max_bands = ff_tns_max_bands_1024[ac->m4ac.sampling_index];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
659 ics->predictor_present = get_bits1(gb);
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
660 ics->predictor_reset_group = 0;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
661 if (ics->predictor_present) {
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
662 if (ac->m4ac.object_type == AOT_AAC_MAIN) {
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
663 if (decode_prediction(ac, ics, gb)) {
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
664 memset(ics, 0, sizeof(IndividualChannelStream));
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
665 return -1;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
666 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
667 } else if (ac->m4ac.object_type == AOT_AAC_LC) {
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
668 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
669 memset(ics, 0, sizeof(IndividualChannelStream));
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
670 return -1;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
671 } else {
9891
7ad7d4094d1f Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents: 9847
diff changeset
672 av_log_missing_feature(ac->avccontext, "Predictor bit set but LTP is", 1);
8200
843d82925adf AAC: Cosmetics after last commit
superdump
parents: 8199
diff changeset
673 memset(ics, 0, sizeof(IndividualChannelStream));
843d82925adf AAC: Cosmetics after last commit
superdump
parents: 8199
diff changeset
674 return -1;
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
675 }
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
676 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
677 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
678
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
679 if (ics->max_sfb > ics->num_swb) {
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
680 av_log(ac->avccontext, AV_LOG_ERROR,
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
681 "Number of scalefactor bands in group (%d) exceeds limit (%d).\n",
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
682 ics->max_sfb, ics->num_swb);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
683 memset(ics, 0, sizeof(IndividualChannelStream));
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
684 return -1;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
685 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
686
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
687 return 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
688 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
689
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
690 /**
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
691 * 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
692 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
693 * @param band_type array of the used band type
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
694 * @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
695 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
696 * @return Returns error status. 0 - OK, !0 - error
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
697 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
698 static int decode_band_types(AACContext *ac, enum BandType band_type[120],
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
699 int band_type_run_end[120], GetBitContext *gb,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
700 IndividualChannelStream *ics)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
701 {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
702 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
703 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
704 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
705 int k = 0;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
706 while (k < ics->max_sfb) {
10519
06d6393bbaeb AAC: Rename sect_len to sect_end. It marks the last sfb of the section, not the
alexc
parents: 10491
diff changeset
707 uint8_t sect_end = k;
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
708 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
709 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
710 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
711 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
712 return -1;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
713 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
714 while ((sect_len_incr = get_bits(gb, bits)) == (1 << bits) - 1)
10519
06d6393bbaeb AAC: Rename sect_len to sect_end. It marks the last sfb of the section, not the
alexc
parents: 10491
diff changeset
715 sect_end += sect_len_incr;
06d6393bbaeb AAC: Rename sect_len to sect_end. It marks the last sfb of the section, not the
alexc
parents: 10491
diff changeset
716 sect_end += sect_len_incr;
11281
11fb96e94573 aac: Keep decode_band_types() from eating all padding at the end of a buffer.
alexc
parents: 11205
diff changeset
717 if (get_bits_left(gb) < 0) {
11fb96e94573 aac: Keep decode_band_types() from eating all padding at the end of a buffer.
alexc
parents: 11205
diff changeset
718 av_log(ac->avccontext, AV_LOG_ERROR, overread_err);
11fb96e94573 aac: Keep decode_band_types() from eating all padding at the end of a buffer.
alexc
parents: 11205
diff changeset
719 return -1;
11fb96e94573 aac: Keep decode_band_types() from eating all padding at the end of a buffer.
alexc
parents: 11205
diff changeset
720 }
10519
06d6393bbaeb AAC: Rename sect_len to sect_end. It marks the last sfb of the section, not the
alexc
parents: 10491
diff changeset
721 if (sect_end > ics->max_sfb) {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
722 av_log(ac->avccontext, AV_LOG_ERROR,
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
723 "Number of bands (%d) exceeds limit (%d).\n",
10519
06d6393bbaeb AAC: Rename sect_len to sect_end. It marks the last sfb of the section, not the
alexc
parents: 10491
diff changeset
724 sect_end, ics->max_sfb);
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
725 return -1;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
726 }
10519
06d6393bbaeb AAC: Rename sect_len to sect_end. It marks the last sfb of the section, not the
alexc
parents: 10491
diff changeset
727 for (; k < sect_end; k++) {
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
728 band_type [idx] = sect_band_type;
10519
06d6393bbaeb AAC: Rename sect_len to sect_end. It marks the last sfb of the section, not the
alexc
parents: 10491
diff changeset
729 band_type_run_end[idx++] = sect_end;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
730 }
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
731 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
732 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
733 return 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
734 }
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
735
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
736 /**
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
737 * 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
738 *
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
739 * @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
740 * @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
741 * @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
742 * @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
743 *
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
744 * @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
745 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
746 static int decode_scalefactors(AACContext *ac, float sf[120], GetBitContext *gb,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
747 unsigned int global_gain,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
748 IndividualChannelStream *ics,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
749 enum BandType band_type[120],
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
750 int band_type_run_end[120])
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
751 {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
752 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
753 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
754 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
755 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
756 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
757 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
758 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
759 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
760 if (band_type[idx] == ZERO_BT) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
761 for (; i < run_end; i++, idx++)
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
762 sf[idx] = 0.;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
763 } else if ((band_type[idx] == INTENSITY_BT) || (band_type[idx] == INTENSITY_BT2)) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
764 for (; i < run_end; i++, idx++) {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
765 offset[2] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
766 if (offset[2] > 255U) {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
767 av_log(ac->avccontext, AV_LOG_ERROR,
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
768 "%s (%d) out of range.\n", sf_str[2], offset[2]);
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
769 return -1;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
770 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
771 sf[idx] = ff_aac_pow2sf_tab[-offset[2] + 300];
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
772 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
773 } else if (band_type[idx] == NOISE_BT) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
774 for (; i < run_end; i++, idx++) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
775 if (noise_flag-- > 0)
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
776 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
777 else
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
778 offset[1] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
779 if (offset[1] > 255U) {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
780 av_log(ac->avccontext, AV_LOG_ERROR,
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
781 "%s (%d) out of range.\n", sf_str[1], offset[1]);
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
782 return -1;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
783 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
784 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
785 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
786 } else {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
787 for (; i < run_end; i++, idx++) {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
788 offset[0] += get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
789 if (offset[0] > 255U) {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
790 av_log(ac->avccontext, AV_LOG_ERROR,
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
791 "%s (%d) out of range.\n", sf_str[0], offset[0]);
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
792 return -1;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
793 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
794 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
795 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
796 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
797 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
798 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
799 return 0;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
800 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
801
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
802 /**
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
803 * 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
804 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
805 static int decode_pulses(Pulse *pulse, GetBitContext *gb,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
806 const uint16_t *swb_offset, int num_swb)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
807 {
7871
8277c41b7160 Validate pulse position and error out if an invalid position is encountered.
superdump
parents: 7858
diff changeset
808 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
809 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
810 pulse_swb = get_bits(gb, 6);
8277c41b7160 Validate pulse position and error out if an invalid position is encountered.
superdump
parents: 7858
diff changeset
811 if (pulse_swb >= num_swb)
8277c41b7160 Validate pulse position and error out if an invalid position is encountered.
superdump
parents: 7858
diff changeset
812 return -1;
8277c41b7160 Validate pulse position and error out if an invalid position is encountered.
superdump
parents: 7858
diff changeset
813 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
814 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
815 if (pulse->pos[0] > 1023)
8277c41b7160 Validate pulse position and error out if an invalid position is encountered.
superdump
parents: 7858
diff changeset
816 return -1;
7580
c49ab52db74c Synchronise AAC decoder code with that from SoC
superdump
parents: 7578
diff changeset
817 pulse->amp[0] = get_bits(gb, 4);
c49ab52db74c Synchronise AAC decoder code with that from SoC
superdump
parents: 7578
diff changeset
818 for (i = 1; i < pulse->num_pulse; i++) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
819 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
820 if (pulse->pos[i] > 1023)
8277c41b7160 Validate pulse position and error out if an invalid position is encountered.
superdump
parents: 7858
diff changeset
821 return -1;
7580
c49ab52db74c Synchronise AAC decoder code with that from SoC
superdump
parents: 7578
diff changeset
822 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
823 }
7871
8277c41b7160 Validate pulse position and error out if an invalid position is encountered.
superdump
parents: 7858
diff changeset
824 return 0;
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
825 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
826
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
827 /**
7609
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
828 * Decode Temporal Noise Shaping data; reference: table 4.48.
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
829 *
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
830 * @return Returns error status. 0 - OK, !0 - error
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
831 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
832 static int decode_tns(AACContext *ac, TemporalNoiseShaping *tns,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
833 GetBitContext *gb, const IndividualChannelStream *ics)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
834 {
7609
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
835 int w, filt, i, coef_len, coef_res, coef_compress;
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
836 const int is8 = ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE;
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
837 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
838 for (w = 0; w < ics->num_windows; w++) {
7637
1fd8e319e8b6 Work around GCC variable may be used uninitialised warning
superdump
parents: 7636
diff changeset
839 if ((tns->n_filt[w] = get_bits(gb, 2 - is8))) {
7609
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
840 coef_res = get_bits1(gb);
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
841
7638
80b097820403 Reindent after last commit
superdump
parents: 7637
diff changeset
842 for (filt = 0; filt < tns->n_filt[w]; filt++) {
80b097820403 Reindent after last commit
superdump
parents: 7637
diff changeset
843 int tmp2_idx;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
844 tns->length[w][filt] = get_bits(gb, 6 - 2 * is8);
7609
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
845
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
846 if ((tns->order[w][filt] = get_bits(gb, 5 - 2 * is8)) > tns_max_order) {
11388
404629a45da1 AAC: Add a new line after the TNS error message.
alexc
parents: 11370
diff changeset
847 av_log(ac->avccontext, AV_LOG_ERROR, "TNS filter order %d is greater than maximum %d.\n",
7638
80b097820403 Reindent after last commit
superdump
parents: 7637
diff changeset
848 tns->order[w][filt], tns_max_order);
80b097820403 Reindent after last commit
superdump
parents: 7637
diff changeset
849 tns->order[w][filt] = 0;
80b097820403 Reindent after last commit
superdump
parents: 7637
diff changeset
850 return -1;
80b097820403 Reindent after last commit
superdump
parents: 7637
diff changeset
851 }
7850
77030651ddd0 Only read some of TNS bitstream data in the case that the TNS filter order is
superdump
parents: 7845
diff changeset
852 if (tns->order[w][filt]) {
7851
a6afd0f2a849 Reindent after last commit
superdump
parents: 7850
diff changeset
853 tns->direction[w][filt] = get_bits1(gb);
a6afd0f2a849 Reindent after last commit
superdump
parents: 7850
diff changeset
854 coef_compress = get_bits1(gb);
a6afd0f2a849 Reindent after last commit
superdump
parents: 7850
diff changeset
855 coef_len = coef_res + 3 - coef_compress;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
856 tmp2_idx = 2 * coef_compress + coef_res;
7638
80b097820403 Reindent after last commit
superdump
parents: 7637
diff changeset
857
7851
a6afd0f2a849 Reindent after last commit
superdump
parents: 7850
diff changeset
858 for (i = 0; i < tns->order[w][filt]; i++)
a6afd0f2a849 Reindent after last commit
superdump
parents: 7850
diff changeset
859 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
860 }
7609
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
861 }
7637
1fd8e319e8b6 Work around GCC variable may be used uninitialised warning
superdump
parents: 7636
diff changeset
862 }
7609
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
863 }
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
864 return 0;
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
865 }
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
866
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
867 /**
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
868 * Decode Mid/Side data; reference: table 4.54.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
869 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
870 * @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
871 * [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
872 * [3] reserved for scalable AAC
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
873 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
874 static void decode_mid_side_stereo(ChannelElement *cpe, GetBitContext *gb,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
875 int ms_present)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
876 {
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
877 int idx;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
878 if (ms_present == 1) {
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
879 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
880 cpe->ms_mask[idx] = get_bits1(gb);
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
881 } else if (ms_present == 2) {
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
882 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
883 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
884 }
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
885
10881
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
886 #ifndef VMUL2
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
887 static inline float *VMUL2(float *dst, const float *v, unsigned idx,
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
888 const float *scale)
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
889 {
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
890 float s = *scale;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
891 *dst++ = v[idx & 15] * s;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
892 *dst++ = v[idx>>4 & 15] * s;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
893 return dst;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
894 }
10881
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
895 #endif
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
896
10881
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
897 #ifndef VMUL4
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
898 static inline float *VMUL4(float *dst, const float *v, unsigned idx,
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
899 const float *scale)
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
900 {
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
901 float s = *scale;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
902 *dst++ = v[idx & 3] * s;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
903 *dst++ = v[idx>>2 & 3] * s;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
904 *dst++ = v[idx>>4 & 3] * s;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
905 *dst++ = v[idx>>6 & 3] * s;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
906 return dst;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
907 }
10881
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
908 #endif
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
909
10881
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
910 #ifndef VMUL2S
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
911 static inline float *VMUL2S(float *dst, const float *v, unsigned idx,
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
912 unsigned sign, const float *scale)
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
913 {
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
914 union float754 s0, s1;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
915
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
916 s0.f = s1.f = *scale;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
917 s0.i ^= sign >> 1 << 31;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
918 s1.i ^= sign << 31;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
919
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
920 *dst++ = v[idx & 15] * s0.f;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
921 *dst++ = v[idx>>4 & 15] * s1.f;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
922
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
923 return dst;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
924 }
10881
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
925 #endif
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
926
10881
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
927 #ifndef VMUL4S
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
928 static inline float *VMUL4S(float *dst, const float *v, unsigned idx,
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
929 unsigned sign, const float *scale)
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
930 {
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
931 unsigned nz = idx >> 12;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
932 union float754 s = { .f = *scale };
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
933 union float754 t;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
934
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
935 t.i = s.i ^ (sign & 1<<31);
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
936 *dst++ = v[idx & 3] * t.f;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
937
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
938 sign <<= nz & 1; nz >>= 1;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
939 t.i = s.i ^ (sign & 1<<31);
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
940 *dst++ = v[idx>>2 & 3] * t.f;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
941
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
942 sign <<= nz & 1; nz >>= 1;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
943 t.i = s.i ^ (sign & 1<<31);
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
944 *dst++ = v[idx>>4 & 3] * t.f;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
945
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
946 sign <<= nz & 1; nz >>= 1;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
947 t.i = s.i ^ (sign & 1<<31);
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
948 *dst++ = v[idx>>6 & 3] * t.f;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
949
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
950 return dst;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
951 }
10881
798c62217427 AAC: ARM/NEON asm for VMUL2/4 functions
mru
parents: 10877
diff changeset
952 #endif
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
953
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
954 /**
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
955 * Decode spectral data; reference: table 4.50.
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
956 * Dequantize and scale spectral data; reference: 4.6.3.3.
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
957 *
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
958 * @param coef array of dequantized, scaled spectral data
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
959 * @param sf array of scalefactors or intensity stereo positions
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
960 * @param pulse_present set if pulses are present
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
961 * @param pulse pointer to pulse data struct
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
962 * @param band_type array of the used band type
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
963 *
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
964 * @return Returns error status. 0 - OK, !0 - error
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
965 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
966 static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024],
10819
dc84199b3306 AAC: add a const to decode_spectrum_and_dequant() args
mru
parents: 10688
diff changeset
967 GetBitContext *gb, const float sf[120],
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
968 int pulse_present, const Pulse *pulse,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
969 const IndividualChannelStream *ics,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
970 enum BandType band_type[120])
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
971 {
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
972 int i, k, g, idx = 0;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
973 const int c = 1024 / ics->num_windows;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
974 const uint16_t *offsets = ics->swb_offset;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
975 float *coef_base = coef;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
976 int err_idx;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
977
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
978 for (g = 0; g < ics->num_windows; g++)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
979 memset(coef + g * 128 + offsets[ics->max_sfb], 0, sizeof(float) * (c - offsets[ics->max_sfb]));
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
980
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
981 for (g = 0; g < ics->num_window_groups; g++) {
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
982 unsigned g_len = ics->group_len[g];
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
983
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
984 for (i = 0; i < ics->max_sfb; i++, idx++) {
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
985 const unsigned cbt_m1 = band_type[idx] - 1;
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
986 float *cfo = coef + offsets[i];
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
987 int off_len = offsets[i + 1] - offsets[i];
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
988 int group;
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
989
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
990 if (cbt_m1 >= INTENSITY_BT2 - 1) {
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
991 for (group = 0; group < g_len; group++, cfo+=128) {
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
992 memset(cfo, 0, off_len * sizeof(float));
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
993 }
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
994 } else if (cbt_m1 == NOISE_BT - 1) {
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
995 for (group = 0; group < g_len; group++, cfo+=128) {
8109
7baa25290231 Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents: 8042
diff changeset
996 float scale;
10252
10df50768c02 AAC: minor simplification in PNS decoding
mru
parents: 10227
diff changeset
997 float band_energy;
10220
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
998
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
999 for (k = 0; k < off_len; k++) {
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1000 ac->random_state = lcg_random(ac->random_state);
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1001 cfo[k] = ac->random_state;
8109
7baa25290231 Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents: 8042
diff changeset
1002 }
10220
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
1003
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1004 band_energy = ac->dsp.scalarproduct_float(cfo, cfo, off_len);
8109
7baa25290231 Fix perceptual noise shaping scaling including an oversight of the offset for
superdump
parents: 8042
diff changeset
1005 scale = sf[idx] / sqrtf(band_energy);
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1006 ac->dsp.vector_fmul_scalar(cfo, cfo, scale, off_len);
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1007 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1008 } else {
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1009 const float *vq = ff_aac_codebook_vector_vals[cbt_m1];
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1010 const uint16_t *cb_vector_idx = ff_aac_codebook_vector_idx[cbt_m1];
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1011 VLC_TYPE (*vlc_tab)[2] = vlc_spectral[cbt_m1].table;
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1012 const int cb_size = ff_aac_spectral_sizes[cbt_m1];
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1013 OPEN_READER(re, gb);
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1014
10876
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1015 switch (cbt_m1 >> 1) {
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1016 case 0:
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1017 for (group = 0; group < g_len; group++, cfo+=128) {
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1018 float *cf = cfo;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1019 int len = off_len;
10220
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
1020
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1021 do {
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1022 int code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1023 unsigned cb_idx;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1024
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1025 UPDATE_CACHE(re, gb);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1026 GET_VLC(code, re, gb, vlc_tab, 8, 2);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1027
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1028 if (code >= cb_size) {
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1029 err_idx = code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1030 goto err_cb_overflow;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1031 }
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1032
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1033 cb_idx = cb_vector_idx[code];
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1034 cf = VMUL4(cf, vq, cb_idx, sf + idx);
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1035 } while (len -= 4);
10876
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1036 }
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1037 break;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1038
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1039 case 1:
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1040 for (group = 0; group < g_len; group++, cfo+=128) {
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1041 float *cf = cfo;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1042 int len = off_len;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1043
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1044 do {
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1045 int code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1046 unsigned nnz;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1047 unsigned cb_idx;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1048 uint32_t bits;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1049
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1050 UPDATE_CACHE(re, gb);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1051 GET_VLC(code, re, gb, vlc_tab, 8, 2);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1052
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1053 if (code >= cb_size) {
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1054 err_idx = code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1055 goto err_cb_overflow;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1056 }
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1057
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1058 #if MIN_CACHE_BITS < 20
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1059 UPDATE_CACHE(re, gb);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1060 #endif
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1061 cb_idx = cb_vector_idx[code];
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1062 nnz = cb_idx >> 8 & 15;
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1063 bits = SHOW_UBITS(re, gb, nnz) << (32-nnz);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1064 LAST_SKIP_BITS(re, gb, nnz);
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1065 cf = VMUL4S(cf, vq, cb_idx, bits, sf + idx);
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1066 } while (len -= 4);
10876
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1067 }
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1068 break;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1069
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1070 case 2:
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1071 for (group = 0; group < g_len; group++, cfo+=128) {
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1072 float *cf = cfo;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1073 int len = off_len;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1074
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1075 do {
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1076 int code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1077 unsigned cb_idx;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1078
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1079 UPDATE_CACHE(re, gb);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1080 GET_VLC(code, re, gb, vlc_tab, 8, 2);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1081
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1082 if (code >= cb_size) {
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1083 err_idx = code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1084 goto err_cb_overflow;
8283
ea8e4095d980 AAC: Unroll code within decode_spectrum_and_dequant(). Gives 12% net speed gain.
superdump
parents: 8282
diff changeset
1085 }
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1086
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1087 cb_idx = cb_vector_idx[code];
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1088 cf = VMUL2(cf, vq, cb_idx, sf + idx);
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1089 } while (len -= 2);
10876
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1090 }
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1091 break;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1092
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1093 case 3:
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1094 case 4:
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1095 for (group = 0; group < g_len; group++, cfo+=128) {
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1096 float *cf = cfo;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1097 int len = off_len;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1098
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1099 do {
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1100 int code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1101 unsigned nnz;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1102 unsigned cb_idx;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1103 unsigned sign;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1104
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1105 UPDATE_CACHE(re, gb);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1106 GET_VLC(code, re, gb, vlc_tab, 8, 2);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1107
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1108 if (code >= cb_size) {
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1109 err_idx = code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1110 goto err_cb_overflow;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1111 }
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1112
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1113 cb_idx = cb_vector_idx[code];
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1114 nnz = cb_idx >> 8 & 15;
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1115 sign = SHOW_UBITS(re, gb, nnz) << (cb_idx >> 12);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1116 LAST_SKIP_BITS(re, gb, nnz);
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1117 cf = VMUL2S(cf, vq, cb_idx, sign, sf + idx);
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1118 } while (len -= 2);
10876
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1119 }
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1120 break;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1121
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1122 default:
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1123 for (group = 0; group < g_len; group++, cfo+=128) {
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1124 float *cf = cfo;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1125 uint32_t *icf = (uint32_t *) cf;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1126 int len = off_len;
03d8758218d2 AAC: Unswitch loop over window groups in decode_spectrum_and_dequant()
mru
parents: 10875
diff changeset
1127
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1128 do {
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1129 int code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1130 unsigned nzt, nnz;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1131 unsigned cb_idx;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1132 uint32_t bits;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1133 int j;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1134
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1135 UPDATE_CACHE(re, gb);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1136 GET_VLC(code, re, gb, vlc_tab, 8, 2);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1137
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1138 if (!code) {
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1139 *icf++ = 0;
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1140 *icf++ = 0;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1141 continue;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1142 }
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1143
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1144 if (code >= cb_size) {
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1145 err_idx = code;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1146 goto err_cb_overflow;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1147 }
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1148
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1149 cb_idx = cb_vector_idx[code];
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1150 nnz = cb_idx >> 12;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1151 nzt = cb_idx >> 8;
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1152 bits = SHOW_UBITS(re, gb, nnz) << (32-nnz);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1153 LAST_SKIP_BITS(re, gb, nnz);
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1154
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1155 for (j = 0; j < 2; j++) {
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1156 if (nzt & 1<<j) {
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1157 uint32_t b;
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1158 int n;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1159 /* The total length of escape_sequence must be < 22 bits according
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1160 to the specification (i.e. max is 111111110xxxxxxxxxxxx). */
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1161 UPDATE_CACHE(re, gb);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1162 b = GET_CACHE(re, gb);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1163 b = 31 - av_log2(~b);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1164
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1165 if (b > 8) {
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1166 av_log(ac->avccontext, AV_LOG_ERROR, "error in spectral data, ESC overflow\n");
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1167 return -1;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1168 }
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1169
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1170 #if MIN_CACHE_BITS < 21
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1171 LAST_SKIP_BITS(re, gb, b + 1);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1172 UPDATE_CACHE(re, gb);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1173 #else
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1174 SKIP_BITS(re, gb, b + 1);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1175 #endif
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1176 b += 4;
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1177 n = (1 << b) + SHOW_UBITS(re, gb, b);
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1178 LAST_SKIP_BITS(re, gb, b);
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1179 *icf++ = cbrt_tab[n] | (bits & 1<<31);
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1180 bits <<= 1;
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1181 } else {
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1182 unsigned v = ((const uint32_t*)vq)[cb_idx & 15];
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1183 *icf++ = (bits & 1<<31) | v;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1184 bits <<= !!v;
9053
c6bd71120376 Re-indent after last commit.
alexc
parents: 9052
diff changeset
1185 }
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1186 cb_idx >>= 4;
9052
54973ad4b7cf Refactor AAC unsigned band type decoding for a modest speedup.
alexc
parents: 9051
diff changeset
1187 }
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1188 } while (len -= 2);
10220
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
1189
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1190 ac->dsp.vector_fmul_scalar(cfo, cfo, sf[idx], off_len);
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1191 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1192 }
10886
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1193
966a8afdd9aa AAC: optimise bitstream reading in decode_spectrum_and_dequant()
mru
parents: 10881
diff changeset
1194 CLOSE_READER(re, gb);
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1195 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1196 }
10875
6a6a1c2d8745 AAC: simplify some calculations in decode_spectrum_and_dequant()
mru
parents: 10874
diff changeset
1197 coef += g_len << 7;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1198 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1199
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1200 if (pulse_present) {
7857
d7801471cd52 Apply pulses to unscaled coefficients rather than scaled.
superdump
parents: 7856
diff changeset
1201 idx = 0;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1202 for (i = 0; i < pulse->num_pulse; i++) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1203 float co = coef_base[ pulse->pos[i] ];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1204 while (offsets[idx + 1] <= pulse->pos[i])
7857
d7801471cd52 Apply pulses to unscaled coefficients rather than scaled.
superdump
parents: 7856
diff changeset
1205 idx++;
d7801471cd52 Apply pulses to unscaled coefficients rather than scaled.
superdump
parents: 7856
diff changeset
1206 if (band_type[idx] != NOISE_BT && sf[idx]) {
7858
f75806078d46 Reindent after last commit
superdump
parents: 7857
diff changeset
1207 float ico = -pulse->amp[i];
f75806078d46 Reindent after last commit
superdump
parents: 7857
diff changeset
1208 if (co) {
f75806078d46 Reindent after last commit
superdump
parents: 7857
diff changeset
1209 co /= sf[idx];
f75806078d46 Reindent after last commit
superdump
parents: 7857
diff changeset
1210 ico = co / sqrtf(sqrtf(fabsf(co))) + (co > 0 ? -ico : ico);
f75806078d46 Reindent after last commit
superdump
parents: 7857
diff changeset
1211 }
f75806078d46 Reindent after last commit
superdump
parents: 7857
diff changeset
1212 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
1213 }
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1214 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1215 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1216 return 0;
10874
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1217
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1218 err_cb_overflow:
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1219 av_log(ac->avccontext, AV_LOG_ERROR,
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1220 "Read beyond end of ff_aac_codebook_vectors[%d][]. index %d >= %d\n",
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1221 band_type[idx], err_idx, ff_aac_spectral_sizes[band_type[idx]]);
bcfe2acbf190 AAC: Compress codebook tables and optimise sign bit handling
mru
parents: 10849
diff changeset
1222 return -1;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1223 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1224
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1225 static av_always_inline float flt16_round(float pf)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1226 {
9179
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1227 union float754 tmp;
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1228 tmp.f = pf;
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1229 tmp.i = (tmp.i + 0x00008000U) & 0xFFFF0000U;
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1230 return tmp.f;
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1231 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1232
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1233 static av_always_inline float flt16_even(float pf)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1234 {
9179
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1235 union float754 tmp;
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1236 tmp.f = pf;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1237 tmp.i = (tmp.i + 0x00007FFFU + (tmp.i & 0x00010000U >> 16)) & 0xFFFF0000U;
9179
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1238 return tmp.f;
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1239 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1240
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1241 static av_always_inline float flt16_trunc(float pf)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1242 {
9179
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1243 union float754 pun;
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1244 pun.f = pf;
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1245 pun.i &= 0xFFFF0000U;
4172c9ef331a AAC: IEEE-754 type punning for 16-bit floating point rounding.
alexc
parents: 9151
diff changeset
1246 return pun.f;
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1247 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1248
11358
a1376a6f9af1 AAC: Mark predictor functions av_always_inline.
alexc
parents: 11281
diff changeset
1249 static av_always_inline void predict(AACContext *ac, PredictorState *ps, float *coef,
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1250 int output_enable)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1251 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1252 const float a = 0.953125; // 61.0 / 64
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1253 const float alpha = 0.90625; // 29.0 / 32
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1254 float e0, e1;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1255 float pv;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1256 float k1, k2;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1257
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1258 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
1259 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
1260
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1261 pv = flt16_round(k1 * ps->r0 + k2 * ps->r1);
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1262 if (output_enable)
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1263 *coef += pv * ac->sf_scale;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1264
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1265 e0 = *coef / ac->sf_scale;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1266 e1 = e0 - k1 * ps->r0;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1267
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1268 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
1269 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
1270 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
1271 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
1272
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1273 ps->r1 = flt16_trunc(a * (ps->r0 - k1 * e0));
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1274 ps->r0 = flt16_trunc(a * e0);
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1275 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1276
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1277 /**
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1278 * Apply AAC-Main style frequency domain prediction.
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1279 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1280 static void apply_prediction(AACContext *ac, SingleChannelElement *sce)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1281 {
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1282 int sfb, k;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1283
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1284 if (!sce->ics.predictor_initialized) {
8413
6f40f7d77263 AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents: 8412
diff changeset
1285 reset_all_predictors(sce->predictor_state);
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1286 sce->ics.predictor_initialized = 1;
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1287 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1288
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1289 if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) {
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1290 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
1291 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
1292 predict(ac, &sce->predictor_state[k], &sce->coeffs[k],
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1293 sce->ics.predictor_present && sce->ics.prediction_used[sfb]);
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1294 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1295 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1296 if (sce->ics.predictor_reset_group)
8413
6f40f7d77263 AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents: 8412
diff changeset
1297 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
1298 } else
8413
6f40f7d77263 AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents: 8412
diff changeset
1299 reset_all_predictors(sce->predictor_state);
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1300 }
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1301
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1302 /**
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1303 * 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
1304 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1305 * @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
1306 * @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
1307 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1308 * @return Returns error status. 0 - OK, !0 - error
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1309 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1310 static int decode_ics(AACContext *ac, SingleChannelElement *sce,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1311 GetBitContext *gb, int common_window, int scale_flag)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1312 {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1313 Pulse pulse;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1314 TemporalNoiseShaping *tns = &sce->tns;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1315 IndividualChannelStream *ics = &sce->ics;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1316 float *out = sce->coeffs;
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1317 int global_gain, pulse_present = 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1318
7580
c49ab52db74c Synchronise AAC decoder code with that from SoC
superdump
parents: 7578
diff changeset
1319 /* 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
1320 * uninitialized when in fact it always is.
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1321 */
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1322 pulse.num_pulse = 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1323
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1324 global_gain = get_bits(gb, 8);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1325
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1326 if (!common_window && !scale_flag) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1327 if (decode_ics_info(ac, ics, gb, 0) < 0)
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1328 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1329 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1330
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1331 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
1332 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1333 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
1334 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1335
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1336 pulse_present = 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1337 if (!scale_flag) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1338 if ((pulse_present = get_bits1(gb))) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1339 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1340 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
1341 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1342 }
7871
8277c41b7160 Validate pulse position and error out if an invalid position is encountered.
superdump
parents: 7858
diff changeset
1343 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
1344 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
1345 return -1;
8277c41b7160 Validate pulse position and error out if an invalid position is encountered.
superdump
parents: 7858
diff changeset
1346 }
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1347 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1348 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
1349 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1350 if (get_bits1(gb)) {
9891
7ad7d4094d1f Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents: 9847
diff changeset
1351 av_log_missing_feature(ac->avccontext, "SSR", 1);
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1352 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1353 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1354 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1355
7580
c49ab52db74c Synchronise AAC decoder code with that from SoC
superdump
parents: 7578
diff changeset
1356 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
1357 return -1;
8199
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1358
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1359 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
1360 apply_prediction(ac, sce);
8a8d40fe77d9 AAC: Frequency domain prediction and hence Main profile support
superdump
parents: 8109
diff changeset
1361
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1362 return 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1363 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1364
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1365 /**
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1366 * Mid/Side stereo decoding; reference: 4.6.8.1.3.
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1367 */
10220
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
1368 static void apply_mid_side_stereo(AACContext *ac, ChannelElement *cpe)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1369 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1370 const IndividualChannelStream *ics = &cpe->ch[0].ics;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1371 float *ch0 = cpe->ch[0].coeffs;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1372 float *ch1 = cpe->ch[1].coeffs;
10220
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
1373 int g, i, group, idx = 0;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1374 const uint16_t *offsets = ics->swb_offset;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1375 for (g = 0; g < ics->num_window_groups; g++) {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1376 for (i = 0; i < ics->max_sfb; i++, idx++) {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1377 if (cpe->ms_mask[idx] &&
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1378 cpe->ch[0].band_type[idx] < NOISE_BT && cpe->ch[1].band_type[idx] < NOISE_BT) {
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1379 for (group = 0; group < ics->group_len[g]; group++) {
10220
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
1380 ac->dsp.butterflies_float(ch0 + group * 128 + offsets[i],
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
1381 ch1 + group * 128 + offsets[i],
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
1382 offsets[i+1] - offsets[i]);
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1383 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1384 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1385 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1386 ch0 += ics->group_len[g] * 128;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1387 ch1 += ics->group_len[g] * 128;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1388 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1389 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1390
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1391 /**
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1392 * intensity stereo decoding; reference: 4.6.8.2.3
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1393 *
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1394 * @param ms_present Indicates mid/side stereo presence. [0] mask is all 0s;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1395 * [1] mask is decoded from bitstream; [2] mask is all 1s;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1396 * [3] reserved for scalable AAC
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1397 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1398 static void apply_intensity_stereo(ChannelElement *cpe, int ms_present)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1399 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1400 const IndividualChannelStream *ics = &cpe->ch[1].ics;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1401 SingleChannelElement *sce1 = &cpe->ch[1];
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1402 float *coef0 = cpe->ch[0].coeffs, *coef1 = cpe->ch[1].coeffs;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1403 const uint16_t *offsets = ics->swb_offset;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1404 int g, group, i, k, idx = 0;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1405 int c;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1406 float scale;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1407 for (g = 0; g < ics->num_window_groups; g++) {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1408 for (i = 0; i < ics->max_sfb;) {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1409 if (sce1->band_type[idx] == INTENSITY_BT || sce1->band_type[idx] == INTENSITY_BT2) {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1410 const int bt_run_end = sce1->band_type_run_end[idx];
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1411 for (; i < bt_run_end; i++, idx++) {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1412 c = -1 + 2 * (sce1->band_type[idx] - 14);
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1413 if (ms_present)
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1414 c *= 1 - 2 * cpe->ms_mask[idx];
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1415 scale = c * sce1->sf[idx];
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1416 for (group = 0; group < ics->group_len[g]; group++)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1417 for (k = offsets[i]; k < offsets[i + 1]; k++)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1418 coef1[group * 128 + k] = scale * coef0[group * 128 + k];
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1419 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1420 } else {
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1421 int bt_run_end = sce1->band_type_run_end[idx];
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1422 idx += bt_run_end - i;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1423 i = bt_run_end;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1424 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1425 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1426 coef0 += ics->group_len[g] * 128;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1427 coef1 += ics->group_len[g] * 128;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1428 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1429 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1430
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1431 /**
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1432 * Decode a channel_pair_element; reference: table 4.4.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1433 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1434 * @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
1435 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1436 * @return Returns error status. 0 - OK, !0 - error
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1437 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1438 static int decode_cpe(AACContext *ac, GetBitContext *gb, ChannelElement *cpe)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1439 {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1440 int i, ret, common_window, ms_present = 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1441
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1442 common_window = get_bits1(gb);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1443 if (common_window) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1444 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
1445 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1446 i = cpe->ch[1].ics.use_kb_window[0];
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1447 cpe->ch[1].ics = cpe->ch[0].ics;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1448 cpe->ch[1].ics.use_kb_window[1] = i;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1449 ms_present = get_bits(gb, 2);
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1450 if (ms_present == 3) {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1451 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
1452 return -1;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1453 } else if (ms_present)
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1454 decode_mid_side_stereo(cpe, gb, ms_present);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1455 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1456 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
1457 return ret;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1458 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
1459 return ret;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1460
8413
6f40f7d77263 AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents: 8412
diff changeset
1461 if (common_window) {
6f40f7d77263 AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents: 8412
diff changeset
1462 if (ms_present)
10220
76132409af55 AAC: use new dsputil functions
mru
parents: 10145
diff changeset
1463 apply_mid_side_stereo(ac, cpe);
8413
6f40f7d77263 AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents: 8412
diff changeset
1464 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
1465 apply_prediction(ac, &cpe->ch[0]);
6f40f7d77263 AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents: 8412
diff changeset
1466 apply_prediction(ac, &cpe->ch[1]);
6f40f7d77263 AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents: 8412
diff changeset
1467 }
6f40f7d77263 AAC: Fix AAC prediction when used in conjunction with the CPE
superdump
parents: 8412
diff changeset
1468 }
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1469
7580
c49ab52db74c Synchronise AAC decoder code with that from SoC
superdump
parents: 7578
diff changeset
1470 apply_intensity_stereo(cpe, ms_present);
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1471 return 0;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1472 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1473
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1474 /**
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1475 * Decode coupling_channel_element; reference: table 4.8.
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1476 *
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1477 * @param elem_id Identifies the instance of a syntax element.
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1478 *
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1479 * @return Returns error status. 0 - OK, !0 - error
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1480 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1481 static int decode_cce(AACContext *ac, GetBitContext *gb, ChannelElement *che)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1482 {
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1483 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
1484 int c, g, sfb, ret;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1485 int sign;
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1486 float scale;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1487 SingleChannelElement *sce = &che->ch[0];
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1488 ChannelCoupling *coup = &che->coup;
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1489
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1490 coup->coupling_point = 2 * get_bits1(gb);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1491 coup->num_coupled = get_bits(gb, 3);
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1492 for (c = 0; c <= coup->num_coupled; c++) {
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1493 num_gain++;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1494 coup->type[c] = get_bits1(gb) ? TYPE_CPE : TYPE_SCE;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1495 coup->id_select[c] = get_bits(gb, 4);
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1496 if (coup->type[c] == TYPE_CPE) {
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1497 coup->ch_select[c] = get_bits(gb, 2);
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1498 if (coup->ch_select[c] == 3)
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1499 num_gain++;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1500 } else
8004
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1501 coup->ch_select[c] = 2;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1502 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1503 coup->coupling_point += get_bits1(gb) || (coup->coupling_point >> 1);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1504
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1505 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
1506 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
1507
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1508 if ((ret = decode_ics(ac, sce, gb, 0, 0)))
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1509 return ret;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1510
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1511 for (c = 0; c < num_gain; c++) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1512 int idx = 0;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1513 int cge = 1;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1514 int gain = 0;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1515 float gain_cache = 1.;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1516 if (c) {
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1517 cge = coup->coupling_point == AFTER_IMDCT ? 1 : get_bits1(gb);
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1518 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
1519 gain_cache = pow(scale, -gain);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1520 }
8822
01271e32d74e Make set coup.gain[c][0] aand only coup.gain[c][0] is set for a independently switched CCE.
alexc
parents: 8814
diff changeset
1521 if (coup->coupling_point == AFTER_IMDCT) {
01271e32d74e Make set coup.gain[c][0] aand only coup.gain[c][0] is set for a independently switched CCE.
alexc
parents: 8814
diff changeset
1522 coup->gain[c][0] = gain_cache;
01271e32d74e Make set coup.gain[c][0] aand only coup.gain[c][0] is set for a independently switched CCE.
alexc
parents: 8814
diff changeset
1523 } else {
8823
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1524 for (g = 0; g < sce->ics.num_window_groups; g++) {
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1525 for (sfb = 0; sfb < sce->ics.max_sfb; sfb++, idx++) {
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1526 if (sce->band_type[idx] != ZERO_BT) {
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1527 if (!cge) {
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1528 int t = get_vlc2(gb, vlc_scalefactors.table, 7, 3) - 60;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1529 if (t) {
8823
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1530 int s = 1;
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1531 t = gain += t;
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1532 if (sign) {
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1533 s -= 2 * (t & 0x1);
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1534 t >>= 1;
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1535 }
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1536 gain_cache = pow(scale, -t) * s;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1537 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1538 }
8823
70ea65c17597 Re-indent after last commit.
alexc
parents: 8822
diff changeset
1539 coup->gain[c][idx] = gain_cache;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1540 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1541 }
7890
20dd4e5e5aa6 Cosmetics: missing brackets
superdump
parents: 7889
diff changeset
1542 }
20dd4e5e5aa6 Cosmetics: missing brackets
superdump
parents: 7889
diff changeset
1543 }
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1544 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1545 return 0;
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
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1548 /**
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1549 * 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
1550 *
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1551 * @return Returns number of bytes consumed.
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1552 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1553 static int decode_drc_channel_exclusions(DynamicRangeControl *che_drc,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1554 GetBitContext *gb)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1555 {
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1556 int i;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1557 int num_excl_chan = 0;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1558
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1559 do {
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1560 for (i = 0; i < 7; i++)
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1561 che_drc->exclude_mask[num_excl_chan++] = get_bits1(gb);
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1562 } while (num_excl_chan < MAX_CHANNELS - 7 && get_bits1(gb));
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1563
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1564 return num_excl_chan / 7;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1565 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1566
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1567 /**
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1568 * Decode dynamic range information; reference: table 4.52.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1569 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1570 * @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
1571 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1572 * @return Returns number of bytes consumed.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1573 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1574 static int decode_dynamic_range(DynamicRangeControl *che_drc,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1575 GetBitContext *gb, int cnt)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1576 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1577 int n = 1;
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1578 int drc_num_bands = 1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1579 int i;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1580
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1581 /* pce_tag_present? */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1582 if (get_bits1(gb)) {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1583 che_drc->pce_instance_tag = get_bits(gb, 4);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1584 skip_bits(gb, 4); // tag_reserved_bits
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1585 n++;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1586 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1587
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1588 /* excluded_chns_present? */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1589 if (get_bits1(gb)) {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1590 n += decode_drc_channel_exclusions(che_drc, gb);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1591 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1592
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1593 /* drc_bands_present? */
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1594 if (get_bits1(gb)) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1595 che_drc->band_incr = get_bits(gb, 4);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1596 che_drc->interpolation_scheme = get_bits(gb, 4);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1597 n++;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1598 drc_num_bands += che_drc->band_incr;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1599 for (i = 0; i < drc_num_bands; i++) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1600 che_drc->band_top[i] = get_bits(gb, 8);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1601 n++;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1602 }
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
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1605 /* prog_ref_level_present? */
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1606 if (get_bits1(gb)) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1607 che_drc->prog_ref_level = get_bits(gb, 7);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1608 skip_bits1(gb); // prog_ref_level_reserved_bits
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1609 n++;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1610 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1611
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1612 for (i = 0; i < drc_num_bands; i++) {
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1613 che_drc->dyn_rng_sgn[i] = get_bits1(gb);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1614 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
1615 n++;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1616 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1617
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1618 return n;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1619 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1620
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1621 /**
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1622 * Decode extension data (incomplete); reference: table 4.51.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1623 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1624 * @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
1625 *
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1626 * @return Returns number of bytes consumed
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1627 */
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1628 static int decode_extension_payload(AACContext *ac, GetBitContext *gb, int cnt,
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1629 ChannelElement *che, enum RawDataBlockType elem_type)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1630 {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1631 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
1632 int res = cnt;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1633 switch (get_bits(gb, 4)) { // extension type
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1634 case EXT_SBR_DATA_CRC:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1635 crc_flag++;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1636 case EXT_SBR_DATA:
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1637 if (!che) {
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1638 av_log(ac->avccontext, AV_LOG_ERROR, "SBR was found before the first channel element.\n");
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1639 return res;
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1640 } else if (!ac->m4ac.sbr) {
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1641 av_log(ac->avccontext, AV_LOG_ERROR, "SBR signaled to be not-present but was found in the bitstream.\n");
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1642 skip_bits_long(gb, 8 * cnt - 4);
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1643 return res;
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1644 } else if (ac->m4ac.sbr == -1 && ac->output_configured == OC_LOCKED) {
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1645 av_log(ac->avccontext, AV_LOG_ERROR, "Implicit SBR was found with a first occurrence after the first frame.\n");
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1646 skip_bits_long(gb, 8 * cnt - 4);
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1647 return res;
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1648 } else {
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1649 ac->m4ac.sbr = 1;
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1650 }
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1651 res = ff_decode_sbr_extension(ac, &che->sbr, gb, crc_flag, cnt, elem_type);
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1652 break;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1653 case EXT_DYNAMIC_RANGE:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1654 res = decode_dynamic_range(&ac->che_drc, gb, cnt);
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1655 break;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1656 case EXT_FILL:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1657 case EXT_FILL_DATA:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1658 case EXT_DATA_ELEMENT:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1659 default:
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1660 skip_bits_long(gb, 8 * cnt - 4);
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1661 break;
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1662 };
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1663 return res;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1664 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1665
7632
ac583bd8f8b3 Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents: 7609
diff changeset
1666 /**
ac583bd8f8b3 Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents: 7609
diff changeset
1667 * 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
1668 *
ac583bd8f8b3 Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents: 7609
diff changeset
1669 * @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
1670 * @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
1671 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1672 static void apply_tns(float coef[1024], TemporalNoiseShaping *tns,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1673 IndividualChannelStream *ics, int decode)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1674 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1675 const int mmm = FFMIN(ics->tns_max_bands, ics->max_sfb);
7636
2774adcaf040 Remove unused variable
superdump
parents: 7634
diff changeset
1676 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
1677 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
1678 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
1679
ac583bd8f8b3 Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents: 7609
diff changeset
1680 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
1681 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
1682 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
1683 top = bottom;
ac583bd8f8b3 Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents: 7609
diff changeset
1684 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
1685 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
1686 if (order == 0)
ac583bd8f8b3 Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents: 7609
diff changeset
1687 continue;
ac583bd8f8b3 Last hunk of the AAC decoder code to be OKed and build system and documentation
superdump
parents: 7609
diff changeset
1688
7788
ffd4b1364b62 Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
vitor
parents: 7733
diff changeset
1689 // tns_decode_coef
ffd4b1364b62 Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
vitor
parents: 7733
diff changeset
1690 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
1691
7609
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1692 start = ics->swb_offset[FFMIN(bottom, mmm)];
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1693 end = ics->swb_offset[FFMIN( top, mmm)];
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1694 if ((size = end - start) <= 0)
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1695 continue;
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1696 if (tns->direction[w][filt]) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1697 inc = -1;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1698 start = end - 1;
7609
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1699 } else {
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1700 inc = 1;
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1701 }
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1702 start += w * 128;
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1703
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1704 // ar filter
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1705 for (m = 0; m < size; m++, start += inc)
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1706 for (i = 1; i <= FFMIN(m, order); i++)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1707 coef[start] -= coef[start - i * inc] * lpc[i - 1];
7609
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1708 }
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1709 }
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1710 }
3f6fc60f1ed3 More OKed AAC decoder code hunks
superdump
parents: 7581
diff changeset
1711
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1712 /**
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1713 * Conduct IMDCT and windowing.
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1714 */
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1715 static void imdct_and_windowing(AACContext *ac, SingleChannelElement *sce, float bias)
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1716 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1717 IndividualChannelStream *ics = &sce->ics;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1718 float *in = sce->coeffs;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1719 float *out = sce->ret;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1720 float *saved = sce->saved;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1721 const float *swindow = ics->use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1722 const float *lwindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_long_1024 : ff_sine_1024;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1723 const float *swindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1724 float *buf = ac->buf_mdct;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1725 float *temp = ac->temp;
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1726 int i;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1727
7661
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1728 // imdct
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1729 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1730 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
1731 av_log(ac->avccontext, AV_LOG_WARNING,
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1732 "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
1733 "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
1734 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
1735 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
1736 } else
7663
66fb1f3937fa Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents: 7662
diff changeset
1737 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
1738
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1739 /* window overlapping
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1740 * 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
1741 * 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
1742 * 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
1743 * 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
1744 */
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1745 if ((ics->window_sequence[1] == ONLY_LONG_SEQUENCE || ics->window_sequence[1] == LONG_STOP_SEQUENCE) &&
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1746 (ics->window_sequence[0] == ONLY_LONG_SEQUENCE || ics->window_sequence[0] == LONG_START_SEQUENCE)) {
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1747 ac->dsp.vector_fmul_window( out, saved, buf, lwindow_prev, bias, 512);
7661
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1748 } else {
7662
dea70eae1e49 Whitespace cosmetics after the last commit
superdump
parents: 7661
diff changeset
1749 for (i = 0; i < 448; i++)
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1750 out[i] = saved[i] + bias;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1751
7661
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1752 if (ics->window_sequence[0] == EIGHT_SHORT_SEQUENCE) {
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1753 ac->dsp.vector_fmul_window(out + 448 + 0*128, saved + 448, buf + 0*128, swindow_prev, bias, 64);
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1754 ac->dsp.vector_fmul_window(out + 448 + 1*128, buf + 0*128 + 64, buf + 1*128, swindow, bias, 64);
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1755 ac->dsp.vector_fmul_window(out + 448 + 2*128, buf + 1*128 + 64, buf + 2*128, swindow, bias, 64);
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1756 ac->dsp.vector_fmul_window(out + 448 + 3*128, buf + 2*128 + 64, buf + 3*128, swindow, bias, 64);
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1757 ac->dsp.vector_fmul_window(temp, buf + 3*128 + 64, buf + 4*128, swindow, bias, 64);
7663
66fb1f3937fa Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents: 7662
diff changeset
1758 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
1759 } else {
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1760 ac->dsp.vector_fmul_window(out + 448, saved + 448, buf, swindow_prev, bias, 64);
7662
dea70eae1e49 Whitespace cosmetics after the last commit
superdump
parents: 7661
diff changeset
1761 for (i = 576; i < 1024; i++)
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1762 out[i] = buf[i-512] + bias;
7661
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1763 }
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1764 }
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1765
7661
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1766 // buffer update
258eb30e6f7d Separate code in imdct_and_windowing() into distinct IMDCT, windowing and
superdump
parents: 7638
diff changeset
1767 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
1768 for (i = 0; i < 64; i++)
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1769 saved[i] = temp[64 + i] - bias;
7663
66fb1f3937fa Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. Reduce
superdump
parents: 7662
diff changeset
1770 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
1771 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
1772 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
1773 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
1774 } 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
1775 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
1776 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
1777 } 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
1778 memcpy( saved, buf + 512, 512 * sizeof(float));
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1779 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1780 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1781
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
1782 /**
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1783 * 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
1784 *
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1785 * @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
1786 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1787 static void apply_dependent_coupling(AACContext *ac,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1788 SingleChannelElement *target,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1789 ChannelElement *cce, int index)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1790 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1791 IndividualChannelStream *ics = &cce->ch[0].ics;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1792 const uint16_t *offsets = ics->swb_offset;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1793 float *dest = target->coeffs;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1794 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
1795 int g, i, group, k, idx = 0;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1796 if (ac->m4ac.object_type == AOT_AAC_LTP) {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1797 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
1798 "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
1799 return;
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1800 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1801 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
1802 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
1803 if (cce->ch[0].band_type[idx] != ZERO_BT) {
9143
5001f33c30f3 AAC: hoist dependent gain lookup out of the loop
alexc
parents: 9074
diff changeset
1804 const float gain = cce->coup.gain[index][idx];
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1805 for (group = 0; group < ics->group_len[g]; group++) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1806 for (k = offsets[i]; k < offsets[i + 1]; k++) {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1807 // XXX dsputil-ize
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1808 dest[group * 128 + k] += gain * src[group * 128 + k];
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1809 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1810 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1811 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1812 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1813 dest += ics->group_len[g] * 128;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1814 src += ics->group_len[g] * 128;
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1815 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1816 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1817
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1818 /**
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1819 * 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
1820 *
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1821 * @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
1822 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1823 static void apply_independent_coupling(AACContext *ac,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1824 SingleChannelElement *target,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1825 ChannelElement *cce, int index)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1826 {
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1827 int i;
9051
0cffed11ee33 Use const to better allow the compiler to optimize AAC independent coupling.
alexc
parents: 8823
diff changeset
1828 const float gain = cce->coup.gain[index][0];
0cffed11ee33 Use const to better allow the compiler to optimize AAC independent coupling.
alexc
parents: 8823
diff changeset
1829 const float bias = ac->add_bias;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1830 const float *src = cce->ch[0].ret;
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1831 float *dest = target->ret;
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1832 const int len = 1024 << (ac->m4ac.sbr == 1);
9051
0cffed11ee33 Use const to better allow the compiler to optimize AAC independent coupling.
alexc
parents: 8823
diff changeset
1833
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1834 for (i = 0; i < len; i++)
9051
0cffed11ee33 Use const to better allow the compiler to optimize AAC independent coupling.
alexc
parents: 8823
diff changeset
1835 dest[i] += gain * (src[i] - bias);
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1836 }
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
1837
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1838 /**
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1839 * channel coupling transformation interface
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1840 *
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1841 * @param index index into coupling gain array
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1842 * @param apply_coupling_method pointer to (in)dependent coupling function
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1843 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1844 static void apply_channel_coupling(AACContext *ac, ChannelElement *cc,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1845 enum RawDataBlockType type, int elem_id,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1846 enum CouplingPoint coupling_point,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1847 void (*apply_coupling_method)(AACContext *ac, SingleChannelElement *target, ChannelElement *cce, int index))
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1848 {
8004
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1849 int i, c;
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1850
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1851 for (i = 0; i < MAX_ELEM_ID; i++) {
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1852 ChannelElement *cce = ac->che[TYPE_CCE][i];
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1853 int index = 0;
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1854
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1855 if (cce && cce->coup.coupling_point == coupling_point) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1856 ChannelCoupling *coup = &cce->coup;
8004
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1857
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1858 for (c = 0; c <= coup->num_coupled; c++) {
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1859 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
1860 if (coup->ch_select[c] != 1) {
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1861 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
1862 if (coup->ch_select[c] != 0)
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1863 index++;
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1864 }
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1865 if (coup->ch_select[c] != 2)
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1866 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
1867 } else
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1868 index += 1 + (coup->ch_select[c] == 3);
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1869 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1870 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1871 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1872 }
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1873
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1874 /**
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1875 * Convert spectral data to float samples, applying all supported tools as appropriate.
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1876 */
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1877 static void spectral_to_sample(AACContext *ac)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1878 {
10688
750102456f00 Undo r20874: It broke AAC decoding.
cehoyos
parents: 10687
diff changeset
1879 int i, type;
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1880 float imdct_bias = (ac->m4ac.sbr <= 0) ? ac->add_bias : 0.0f;
10688
750102456f00 Undo r20874: It broke AAC decoding.
cehoyos
parents: 10687
diff changeset
1881 for (type = 3; type >= 0; type--) {
8004
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1882 for (i = 0; i < MAX_ELEM_ID; i++) {
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1883 ChannelElement *che = ac->che[type][i];
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1884 if (che) {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1885 if (type <= TYPE_CPE)
8004
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1886 apply_channel_coupling(ac, che, type, i, BEFORE_TNS, apply_dependent_coupling);
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1887 if (che->ch[0].tns.present)
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1888 apply_tns(che->ch[0].coeffs, &che->ch[0].tns, &che->ch[0].ics, 1);
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1889 if (che->ch[1].tns.present)
7581
6fdffa4836a7 More OKed AAC decoder hunks
superdump
parents: 7580
diff changeset
1890 apply_tns(che->ch[1].coeffs, &che->ch[1].tns, &che->ch[1].ics, 1);
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1891 if (type <= TYPE_CPE)
8004
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1892 apply_channel_coupling(ac, che, type, i, BETWEEN_TNS_AND_IMDCT, apply_dependent_coupling);
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1893 if (type != TYPE_CCE || che->coup.coupling_point == AFTER_IMDCT) {
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1894 imdct_and_windowing(ac, &che->ch[0], imdct_bias);
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1895 if (ac->m4ac.sbr > 0) {
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1896 ff_sbr_dequant(ac, &che->sbr, type == TYPE_CPE ? TYPE_CPE : TYPE_SCE);
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1897 ff_sbr_apply(ac, &che->sbr, 0, che->ch[0].ret, che->ch[0].ret);
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1898 }
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1899 }
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1900 if (type == TYPE_CPE) {
11481
96dde15b2e0d aac: Don't bias output during the IMDCT if SBR will be used.
alexc
parents: 11401
diff changeset
1901 imdct_and_windowing(ac, &che->ch[1], imdct_bias);
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1902 if (ac->m4ac.sbr > 0)
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1903 ff_sbr_apply(ac, &che->sbr, 1, che->ch[1].ret, che->ch[1].ret);
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1904 }
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1905 if (type <= TYPE_CCE)
8004
8fd8f23be794 Corrections to channel coupling code to attain conformance for appropriate
superdump
parents: 7891
diff changeset
1906 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
1907 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1908 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1909 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1910 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1911
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1912 static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1913 {
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1914 int size;
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1915 AACADTSHeaderInfo hdr_info;
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1916
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1917 size = ff_aac_parse_header(gb, &hdr_info);
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1918 if (size > 0) {
10491
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
1919 if (ac->output_configured != OC_LOCKED && hdr_info.chan_config) {
9948
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
1920 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID];
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
1921 memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0]));
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1922 ac->m4ac.chan_config = hdr_info.chan_config;
9948
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
1923 if (set_default_channel_config(ac, new_che_pos, hdr_info.chan_config))
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
1924 return -7;
10491
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
1925 if (output_configure(ac, ac->che_pos, new_che_pos, hdr_info.chan_config, OC_TRIAL_FRAME))
9948
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
1926 return -7;
10491
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
1927 } else if (ac->output_configured != OC_LOCKED) {
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
1928 ac->output_configured = OC_NONE;
9948
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
1929 }
10621
62b3faabb663 Set the SBR mode to implicit on ADTS frames occurring before the output is locked.
alexc
parents: 10551
diff changeset
1930 if (ac->output_configured != OC_LOCKED)
62b3faabb663 Set the SBR mode to implicit on ADTS frames occurring before the output is locked.
alexc
parents: 10551
diff changeset
1931 ac->m4ac.sbr = -1;
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1932 ac->m4ac.sample_rate = hdr_info.sample_rate;
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1933 ac->m4ac.sampling_index = hdr_info.sampling_index;
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1934 ac->m4ac.object_type = hdr_info.object_type;
10657
168ea860d58f aac: Set sample rate in avctx from ADTS header (if not already set by some
andoma
parents: 10622
diff changeset
1935 if (!ac->avccontext->sample_rate)
168ea860d58f aac: Set sample rate in avctx from ADTS header (if not already set by some
andoma
parents: 10622
diff changeset
1936 ac->avccontext->sample_rate = hdr_info.sample_rate;
9151
1c478e02676a Re-indent after last commit.
alexc
parents: 9150
diff changeset
1937 if (hdr_info.num_aac_frames == 1) {
1c478e02676a Re-indent after last commit.
alexc
parents: 9150
diff changeset
1938 if (!hdr_info.crc_absent)
1c478e02676a Re-indent after last commit.
alexc
parents: 9150
diff changeset
1939 skip_bits(gb, 16);
1c478e02676a Re-indent after last commit.
alexc
parents: 9150
diff changeset
1940 } else {
9891
7ad7d4094d1f Rename ff_log_missing_feature() to av_log_missing_feature().
rbultje
parents: 9847
diff changeset
1941 av_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0);
9151
1c478e02676a Re-indent after last commit.
alexc
parents: 9150
diff changeset
1942 return -1;
1c478e02676a Re-indent after last commit.
alexc
parents: 9150
diff changeset
1943 }
9150
4fe6dee5f1dd If we get an error from ff_aac_parse_header() we should not trust the header info that it provides.
alexc
parents: 9149
diff changeset
1944 }
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1945 return size;
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1946 }
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1947
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1948 static int aac_decode_frame(AVCodecContext *avccontext, void *data,
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1949 int *data_size, AVPacket *avpkt)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1950 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9251
diff changeset
1951 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 9251
diff changeset
1952 int buf_size = avpkt->size;
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1953 AACContext *ac = avccontext->priv_data;
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1954 ChannelElement *che = NULL, *che_prev = NULL;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1955 GetBitContext gb;
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
1956 enum RawDataBlockType elem_type, elem_type_prev = TYPE_END;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1957 int err, elem_id, data_size_tmp;
11362
1682a19a0881 AAC: Return the number of bytes consumed in decoding a frame.
alexc
parents: 11358
diff changeset
1958 int buf_consumed;
11393
d23864bc3887 AAC: Set codec parameters in the first frame rather than in .init()
alexc
parents: 11388
diff changeset
1959 int samples = 1024, multiplier;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1960
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1961 init_get_bits(&gb, buf, buf_size * 8);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1962
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1963 if (show_bits(&gb, 12) == 0xfff) {
9510
f0f37cb6e3e5 Remove unnecessary assignment, found by CSA.
superdump
parents: 9428
diff changeset
1964 if (parse_adts_frame_header(ac, &gb) < 0) {
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1965 av_log(avccontext, AV_LOG_ERROR, "Error decoding AAC frame header.\n");
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1966 return -1;
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1967 }
8812
541889e539b8 Add support for sample rate index 12, 7350 Hz
superdump
parents: 8811
diff changeset
1968 if (ac->m4ac.sampling_index > 12) {
8789
b2a991a936e1 Check sampling index validity for AAC decoding
superdump
parents: 8718
diff changeset
1969 av_log(ac->avccontext, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->m4ac.sampling_index);
b2a991a936e1 Check sampling index validity for AAC decoding
superdump
parents: 8718
diff changeset
1970 return -1;
b2a991a936e1 Check sampling index validity for AAC decoding
superdump
parents: 8718
diff changeset
1971 }
8549
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1972 }
2cbfa4cd4670 Support ADTS AAC files in the ffaac decoder (limited to streams containing one
superdump
parents: 8502
diff changeset
1973
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1974 // parse
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1975 while ((elem_type = get_bits(&gb, 3)) != TYPE_END) {
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1976 elem_id = get_bits(&gb, 4);
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1977
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
1978 if (elem_type < TYPE_DSE && !(che=get_che(ac, elem_type, elem_id))) {
8814
ac7958d25361 AAC: Cosmetic alterations after the last commit
superdump
parents: 8813
diff changeset
1979 av_log(ac->avccontext, AV_LOG_ERROR, "channel element %d.%d is not allocated\n", elem_type, elem_id);
ac7958d25361 AAC: Cosmetic alterations after the last commit
superdump
parents: 8813
diff changeset
1980 return -1;
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1981 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1982
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1983 switch (elem_type) {
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1984
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1985 case TYPE_SCE:
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
1986 err = decode_ics(ac, &che->ch[0], &gb, 0, 0);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1987 break;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1988
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1989 case TYPE_CPE:
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
1990 err = decode_cpe(ac, &gb, che);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1991 break;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1992
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1993 case TYPE_CCE:
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
1994 err = decode_cce(ac, &gb, che);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1995 break;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1996
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1997 case TYPE_LFE:
9149
955835e2bc99 Fix the channel allocation bug/assumption (issue 800).
alexc
parents: 9143
diff changeset
1998 err = decode_ics(ac, &che->ch[0], &gb, 0, 0);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
1999 break;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2000
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2001 case TYPE_DSE:
11205
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2002 err = skip_data_stream_element(ac, &gb);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2003 break;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2004
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2005 case TYPE_PCE: {
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2006 enum ChannelPosition new_che_pos[4][MAX_ELEM_ID];
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2007 memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0]));
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2008 if ((err = decode_pce(ac, new_che_pos, &gb)))
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2009 break;
10551
a0dd118e82ae 10l: Fix inverted if-condition from r20448. Fixes issue 1562.
alexc
parents: 10519
diff changeset
2010 if (ac->output_configured > OC_TRIAL_PCE)
9948
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
2011 av_log(avccontext, AV_LOG_ERROR,
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
2012 "Not evaluating a further program_config_element as this construct is dubious at best.\n");
98fd723f72e7 Ignore subsequent channel configurations after the first in an AAC file. The
alexc
parents: 9891
diff changeset
2013 else
10491
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
2014 err = output_configure(ac, ac->che_pos, new_che_pos, 0, OC_TRIAL_PCE);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2015 break;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2016 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2017
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2018 case TYPE_FIL:
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2019 if (elem_id == 15)
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2020 elem_id += get_bits(&gb, 8) - 1;
11205
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2021 if (get_bits_left(&gb) < 8 * elem_id) {
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2022 av_log(avccontext, AV_LOG_ERROR, overread_err);
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2023 return -1;
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2024 }
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2025 while (elem_id > 0)
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2026 elem_id -= decode_extension_payload(ac, &gb, elem_id, che_prev, elem_type_prev);
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2027 err = 0; /* FIXME */
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2028 break;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2029
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2030 default:
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2031 err = -1; /* should not happen, but keeps compiler happy */
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2032 break;
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2033 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2034
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2035 che_prev = che;
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2036 elem_type_prev = elem_type;
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2037
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2038 if (err)
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2039 return err;
11205
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2040
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2041 if (get_bits_left(&gb) < 3) {
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2042 av_log(avccontext, AV_LOG_ERROR, overread_err);
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2043 return -1;
f5d50932acc0 Add some AAC buffer overread checks.
alexc
parents: 11177
diff changeset
2044 }
7578
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2045 }
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2046
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2047 spectral_to_sample(ac);
a05954c505ab More OKed sections of AAC decoder code
superdump
parents: 7540
diff changeset
2048
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2049 multiplier = (ac->m4ac.sbr == 1) ? ac->m4ac.ext_sample_rate > ac->m4ac.sample_rate : 0;
11393
d23864bc3887 AAC: Set codec parameters in the first frame rather than in .init()
alexc
parents: 11388
diff changeset
2050 samples <<= multiplier;
d23864bc3887 AAC: Set codec parameters in the first frame rather than in .init()
alexc
parents: 11388
diff changeset
2051 if (ac->output_configured < OC_LOCKED) {
d23864bc3887 AAC: Set codec parameters in the first frame rather than in .init()
alexc
parents: 11388
diff changeset
2052 avccontext->sample_rate = ac->m4ac.sample_rate << multiplier;
d23864bc3887 AAC: Set codec parameters in the first frame rather than in .init()
alexc
parents: 11388
diff changeset
2053 avccontext->frame_size = samples;
d23864bc3887 AAC: Set codec parameters in the first frame rather than in .init()
alexc
parents: 11388
diff changeset
2054 }
d23864bc3887 AAC: Set codec parameters in the first frame rather than in .init()
alexc
parents: 11388
diff changeset
2055
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2056 data_size_tmp = samples * avccontext->channels * sizeof(int16_t);
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2057 if (*data_size < data_size_tmp) {
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
2058 av_log(avccontext, AV_LOG_ERROR,
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
2059 "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
2060 *data_size, data_size_tmp);
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
2061 return -1;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
2062 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
2063 *data_size = data_size_tmp;
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
2064
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2065 ac->dsp.float_to_int16_interleave(data, (const float **)ac->output_data, samples, avccontext->channels);
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
2066
10491
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
2067 if (ac->output_configured)
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
2068 ac->output_configured = OC_LOCKED;
74e51b86b934 Don't lock the channel output configuration based on the first value seen for
alexc
parents: 10378
diff changeset
2069
11362
1682a19a0881 AAC: Return the number of bytes consumed in decoding a frame.
alexc
parents: 11358
diff changeset
2070 buf_consumed = (get_bits_count(&gb) + 7) >> 3;
1682a19a0881 AAC: Return the number of bytes consumed in decoding a frame.
alexc
parents: 11358
diff changeset
2071 return buf_size > buf_consumed ? buf_consumed : buf_size;
7539
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
2072 }
4fca7939ad48 More OKed hunks of the AAC decoder from SoC
superdump
parents: 7523
diff changeset
2073
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2074 static av_cold int aac_decode_close(AVCodecContext *avccontext)
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2075 {
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2076 AACContext *ac = avccontext->priv_data;
7540
5298e05f931d Synchronise code with AAC decoder in SoC
superdump
parents: 7539
diff changeset
2077 int i, type;
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2078
7523
a3f7ffdb676d Sync already committed code with that in SoC and commit more OKed hunks of code
superdump
parents: 7501
diff changeset
2079 for (i = 0; i < MAX_ELEM_ID; i++) {
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2080 for (type = 0; type < 4; type++) {
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2081 if (ac->che[type][i])
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2082 ff_aac_sbr_ctx_close(&ac->che[type][i]->sbr);
7540
5298e05f931d Synchronise code with AAC decoder in SoC
superdump
parents: 7539
diff changeset
2083 av_freep(&ac->che[type][i]);
11401
e340262ba532 Add an HE-AAC v1 decoder.
alexc
parents: 11394
diff changeset
2084 }
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2085 }
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2086
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2087 ff_mdct_end(&ac->mdct);
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2088 ff_mdct_end(&ac->mdct_small);
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2089 return 0;
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2090 }
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2091
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2092 AVCodec aac_decoder = {
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2093 "aac",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11489
diff changeset
2094 AVMEDIA_TYPE_AUDIO,
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2095 CODEC_ID_AAC,
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2096 sizeof(AACContext),
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2097 aac_decode_init,
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2098 NULL,
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2099 aac_decode_close,
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2100 aac_decode_frame,
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2101 .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"),
10145
7955db355703 Make sample_fmts and channel_layouts compound literals const to reduce size of
reimar
parents: 10004
diff changeset
2102 .sample_fmts = (const enum SampleFormat[]) {
10004
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2103 SAMPLE_FMT_S16,SAMPLE_FMT_NONE
15c5048b9a49 cosmetics: K&R coding style
diego
parents: 9949
diff changeset
2104 },
10306
c97a6cabee62 AAC: Add channel layout support for channel configuration as defined in the
superdump
parents: 10252
diff changeset
2105 .channel_layouts = aac_channel_layout,
7501
d6012be599d3 OKed sections of code from the SoC AAC decoder
superdump
parents:
diff changeset
2106 };