annotate aac.c @ 10576:64c8bc5340bd libavcodec

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