annotate wmadec.c @ 12478:5942c42c44e5 libavcodec

Add G.722 ADPCM audio decoder
author mstorsjo
date Thu, 09 Sep 2010 19:21:16 +0000
parents ab330d7112ad
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
1 /*
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
2 * WMA compatible decoder
8629
04423b2f6e0b cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 7712
diff changeset
3 * Copyright (c) 2002 The FFmpeg Project
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
16 *
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3776
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 3022
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
20 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
21
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
22 /**
11644
7dd2a45249a9 Remove explicit filename from Doxygen @file commands.
diego
parents: 11560
diff changeset
23 * @file
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
24 * WMA compatible decoder.
1967
2b0fc6b25ab8 add the minimal documentation to make this decoder useful
melanson
parents: 1750
diff changeset
25 * This decoder handles Microsoft Windows Media Audio data, versions 1 & 2.
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
26 * WMA v1 is identified by audio format 0x160 in Microsoft media files
1967
2b0fc6b25ab8 add the minimal documentation to make this decoder useful
melanson
parents: 1750
diff changeset
27 * (ASF/AVI/WAV). WMA v2 is identified by audio format 0x161.
2b0fc6b25ab8 add the minimal documentation to make this decoder useful
melanson
parents: 1750
diff changeset
28 *
2b0fc6b25ab8 add the minimal documentation to make this decoder useful
melanson
parents: 1750
diff changeset
29 * To use this decoder, a calling application must supply the extra data
2b0fc6b25ab8 add the minimal documentation to make this decoder useful
melanson
parents: 1750
diff changeset
30 * bytes provided with the WMA data. These are the extra, codec-specific
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
31 * bytes at the end of a WAVEFORMATEX data structure. Transmit these bytes
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
32 * to the decoder using the extradata[_size] fields in AVCodecContext. There
1967
2b0fc6b25ab8 add the minimal documentation to make this decoder useful
melanson
parents: 1750
diff changeset
33 * should be 4 extra bytes for v1 data and 6 extra bytes for v2 data.
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
34 */
1e39f273ecd6 per file doxy
michaelni
parents: 1064
diff changeset
35
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
36 #include "avcodec.h"
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
37 #include "wma.h"
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
38
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
39 #undef NDEBUG
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
40 #include <assert.h>
3113
ab01ee59324f - fix insufficient code length for exp_vlc
henry
parents: 3089
diff changeset
41
ab01ee59324f - fix insufficient code length for exp_vlc
henry
parents: 3089
diff changeset
42 #define EXPVLCBITS 8
ab01ee59324f - fix insufficient code length for exp_vlc
henry
parents: 3089
diff changeset
43 #define EXPMAX ((19+EXPVLCBITS-1)/EXPVLCBITS)
ab01ee59324f - fix insufficient code length for exp_vlc
henry
parents: 3089
diff changeset
44
ab01ee59324f - fix insufficient code length for exp_vlc
henry
parents: 3089
diff changeset
45 #define HGAINVLCBITS 9
ab01ee59324f - fix insufficient code length for exp_vlc
henry
parents: 3089
diff changeset
46 #define HGAINMAX ((13+HGAINVLCBITS-1)/HGAINVLCBITS)
3022
d4080a510724 get_vlc -> get_vlc2 transition.
banan
parents: 2992
diff changeset
47
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
48 static void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
49
1342
f574934c4219 uniformization (now it uses the same trace functions as h264, defined in common.h)
al3x
parents: 1303
diff changeset
50 #ifdef TRACE
5517
998ed46cfa66 fix compilation with TRACE enabled
alex
parents: 5513
diff changeset
51 static void dump_shorts(WMACodecContext *s, const char *name, const short *tab, int n)
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
52 {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
53 int i;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
54
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
55 tprintf(s->avctx, "%s[%d]:\n", name, n);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
56 for(i=0;i<n;i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
57 if ((i & 7) == 0)
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
58 tprintf(s->avctx, "%4d: ", i);
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
59 tprintf(s->avctx, " %5d.0", tab[i]);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
60 if ((i & 7) == 7)
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
61 tprintf(s->avctx, "\n");
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
62 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
63 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
64
5517
998ed46cfa66 fix compilation with TRACE enabled
alex
parents: 5513
diff changeset
65 static void dump_floats(WMACodecContext *s, const char *name, int prec, const float *tab, int n)
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
66 {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
67 int i;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
68
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
69 tprintf(s->avctx, "%s[%d]:\n", name, n);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
70 for(i=0;i<n;i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
71 if ((i & 7) == 0)
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
72 tprintf(s->avctx, "%4d: ", i);
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
73 tprintf(s->avctx, " %8.*f", prec, tab[i]);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
74 if ((i & 7) == 7)
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
75 tprintf(s->avctx, "\n");
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
76 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
77 if ((i & 7) != 0)
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
78 tprintf(s->avctx, "\n");
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
79 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
80 #endif
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
81
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
82 static int wma_decode_init(AVCodecContext * avctx)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
83 {
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
84 WMACodecContext *s = avctx->priv_data;
10275
ae08043eb532 WMA: remove some unused variables
mru
parents: 10248
diff changeset
85 int i, flags2;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
86 uint8_t *extradata;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
87
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
88 s->avctx = avctx;
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
89
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
90 /* extract flag infos */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
91 flags2 = 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
92 extradata = avctx->extradata;
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
93 if (avctx->codec->id == CODEC_ID_WMAV1 && avctx->extradata_size >= 4) {
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 5086
diff changeset
94 flags2 = AV_RL16(extradata+2);
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
95 } else if (avctx->codec->id == CODEC_ID_WMAV2 && avctx->extradata_size >= 6) {
5089
bff60ecc02f9 Use AV_xx throughout libavcodec
ramiro
parents: 5086
diff changeset
96 flags2 = AV_RL16(extradata+4);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
97 }
4491
a6ca201dd590 kill debuging code
michael
parents: 4490
diff changeset
98 // for(i=0; i<avctx->extradata_size; i++)
a6ca201dd590 kill debuging code
michael
parents: 4490
diff changeset
99 // av_log(NULL, AV_LOG_ERROR, "%02X ", extradata[i]);
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
100
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
101 s->use_exp_vlc = flags2 & 0x0001;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
102 s->use_bit_reservoir = flags2 & 0x0002;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
103 s->use_variable_block_len = flags2 & 0x0004;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
104
5086
a10ebd496bd9 sanity checks (should prevent hypothetical div by zero issue)
michael
parents: 4785
diff changeset
105 if(ff_wma_init(avctx, flags2)<0)
a10ebd496bd9 sanity checks (should prevent hypothetical div by zero issue)
michael
parents: 4785
diff changeset
106 return -1;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
107
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
108 /* init MDCT */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
109 for(i = 0; i < s->nb_block_sizes; i++)
9658
67a20f0eb42c Support for getting (i)MDCT output multiplied by a constant scaling factor.
serge
parents: 9472
diff changeset
110 ff_mdct_init(&s->mdct_ctx[i], s->frame_len_bits - i + 1, 1, 1.0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
111
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
112 if (s->use_noise_coding) {
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
113 init_vlc(&s->hgain_vlc, HGAINVLCBITS, sizeof(ff_wma_hgain_huffbits),
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
114 ff_wma_hgain_huffbits, 1, 1,
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
115 ff_wma_hgain_huffcodes, 2, 2, 0);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
116 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
117
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
118 if (s->use_exp_vlc) {
11215
964d01b50f17 remove a Huffman table from WMA which also exists in AAC
stefang
parents: 11062
diff changeset
119 init_vlc(&s->exp_vlc, EXPVLCBITS, sizeof(ff_aac_scalefactor_bits), //FIXME move out of context
964d01b50f17 remove a Huffman table from WMA which also exists in AAC
stefang
parents: 11062
diff changeset
120 ff_aac_scalefactor_bits, 1, 1,
964d01b50f17 remove a Huffman table from WMA which also exists in AAC
stefang
parents: 11062
diff changeset
121 ff_aac_scalefactor_code, 4, 4, 0);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
122 } else {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
123 wma_lsp_to_curve_init(s, s->frame_len);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
124 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
125
7451
85ab7655ad4d Modify all codecs to report their supported input and output sample format(s).
pross
parents: 7244
diff changeset
126 avctx->sample_fmt = SAMPLE_FMT_S16;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
127 return 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
128 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
129
4497
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
130 /**
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
131 * compute x^-0.25 with an exponent and mantissa table. We use linear
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
132 * interpolation to reduce the mantissa table size at a small speed
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
133 * expense (linear interpolation approximately doubles the number of
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
134 * bits of precision).
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
135 */
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
136 static inline float pow_m1_4(WMACodecContext *s, float x)
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
137 {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
138 union {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
139 float f;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
140 unsigned int v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
141 } u, t;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
142 unsigned int e, m;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
143 float a, b;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
144
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
145 u.f = x;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
146 e = u.v >> 23;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
147 m = (u.v >> (23 - LSP_POW_BITS)) & ((1 << LSP_POW_BITS) - 1);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
148 /* build interpolation scale: 1 <= t < 2. */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
149 t.v = ((u.v << LSP_POW_BITS) & ((1 << 23) - 1)) | (127 << 23);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
150 a = s->lsp_pow_m_table1[m];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
151 b = s->lsp_pow_m_table2[m];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
152 return s->lsp_pow_e_table[e] * (a + b * t.f);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
153 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
154
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
155 static void wma_lsp_to_curve_init(WMACodecContext *s, int frame_len)
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
156 {
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
157 float wdel, a, b;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
158 int i, e, m;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
159
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
160 wdel = M_PI / frame_len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
161 for(i=0;i<frame_len;i++)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
162 s->lsp_cos_table[i] = 2.0f * cos(wdel * i);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
163
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
164 /* tables for x^-0.25 computation */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
165 for(i=0;i<256;i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
166 e = i - 126;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
167 s->lsp_pow_e_table[i] = pow(2.0, e * -0.25);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
168 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
169
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
170 /* NOTE: these two tables are needed to avoid two operations in
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
171 pow_m1_4 */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
172 b = 1.0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
173 for(i=(1 << LSP_POW_BITS) - 1;i>=0;i--) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
174 m = (1 << LSP_POW_BITS) + i;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
175 a = (float)m * (0.5 / (1 << LSP_POW_BITS));
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
176 a = pow(a, -0.25);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
177 s->lsp_pow_m_table1[i] = 2 * a - b;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
178 s->lsp_pow_m_table2[i] = b - a;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
179 b = a;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
180 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
181 #if 0
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
182 for(i=1;i<20;i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
183 float v, r1, r2;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
184 v = 5.0 / i;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
185 r1 = pow_m1_4(s, v);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
186 r2 = pow(v,-0.25);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
187 printf("%f^-0.25=%f e=%f\n", v, r1, r2 - r1);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
188 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
189 #endif
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
190 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
191
4497
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
192 /**
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
193 * NOTE: We use the same code as Vorbis here
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
194 * @todo optimize it further with SSE/3Dnow
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
195 */
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
196 static void wma_lsp_to_curve(WMACodecContext *s,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
197 float *out, float *val_max_ptr,
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
198 int n, float *lsp)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
199 {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
200 int i, j;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
201 float p, q, w, v, val_max;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
202
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
203 val_max = 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
204 for(i=0;i<n;i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
205 p = 0.5f;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
206 q = 0.5f;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
207 w = s->lsp_cos_table[i];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
208 for(j=1;j<NB_LSP_COEFS;j+=2){
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
209 q *= w - lsp[j - 1];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
210 p *= w - lsp[j];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
211 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
212 p *= p * (2.0f - w);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
213 q *= q * (2.0f + w);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
214 v = p + q;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
215 v = pow_m1_4(s, v);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
216 if (v > val_max)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
217 val_max = v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
218 out[i] = v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
219 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
220 *val_max_ptr = val_max;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
221 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
222
4497
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
223 /**
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
224 * decode exponents coded with LSP coefficients (same idea as Vorbis)
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
225 */
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
226 static void decode_exp_lsp(WMACodecContext *s, int ch)
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
227 {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
228 float lsp_coefs[NB_LSP_COEFS];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
229 int val, i;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
230
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
231 for(i = 0; i < NB_LSP_COEFS; i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
232 if (i == 0 || i >= 8)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
233 val = get_bits(&s->gb, 3);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
234 else
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
235 val = get_bits(&s->gb, 4);
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
236 lsp_coefs[i] = ff_wma_lsp_codebook[i][val];
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
237 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
238
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
239 wma_lsp_to_curve(s, s->exponents[ch], &s->max_exponent[ch],
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
240 s->block_len, lsp_coefs);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
241 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
242
10564
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
243 /** pow(10, i / 16.0) for i in -60..95 */
10561
d0e17b0a6845 WMA: extend exponent table up to 75
mru
parents: 10317
diff changeset
244 static const float pow_tab[] = {
10312
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
245 1.7782794100389e-04, 2.0535250264571e-04,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
246 2.3713737056617e-04, 2.7384196342644e-04,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
247 3.1622776601684e-04, 3.6517412725484e-04,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
248 4.2169650342858e-04, 4.8696752516586e-04,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
249 5.6234132519035e-04, 6.4938163157621e-04,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
250 7.4989420933246e-04, 8.6596432336006e-04,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
251 1.0000000000000e-03, 1.1547819846895e-03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
252 1.3335214321633e-03, 1.5399265260595e-03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
253 1.7782794100389e-03, 2.0535250264571e-03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
254 2.3713737056617e-03, 2.7384196342644e-03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
255 3.1622776601684e-03, 3.6517412725484e-03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
256 4.2169650342858e-03, 4.8696752516586e-03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
257 5.6234132519035e-03, 6.4938163157621e-03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
258 7.4989420933246e-03, 8.6596432336006e-03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
259 1.0000000000000e-02, 1.1547819846895e-02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
260 1.3335214321633e-02, 1.5399265260595e-02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
261 1.7782794100389e-02, 2.0535250264571e-02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
262 2.3713737056617e-02, 2.7384196342644e-02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
263 3.1622776601684e-02, 3.6517412725484e-02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
264 4.2169650342858e-02, 4.8696752516586e-02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
265 5.6234132519035e-02, 6.4938163157621e-02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
266 7.4989420933246e-02, 8.6596432336007e-02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
267 1.0000000000000e-01, 1.1547819846895e-01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
268 1.3335214321633e-01, 1.5399265260595e-01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
269 1.7782794100389e-01, 2.0535250264571e-01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
270 2.3713737056617e-01, 2.7384196342644e-01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
271 3.1622776601684e-01, 3.6517412725484e-01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
272 4.2169650342858e-01, 4.8696752516586e-01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
273 5.6234132519035e-01, 6.4938163157621e-01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
274 7.4989420933246e-01, 8.6596432336007e-01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
275 1.0000000000000e+00, 1.1547819846895e+00,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
276 1.3335214321633e+00, 1.5399265260595e+00,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
277 1.7782794100389e+00, 2.0535250264571e+00,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
278 2.3713737056617e+00, 2.7384196342644e+00,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
279 3.1622776601684e+00, 3.6517412725484e+00,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
280 4.2169650342858e+00, 4.8696752516586e+00,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
281 5.6234132519035e+00, 6.4938163157621e+00,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
282 7.4989420933246e+00, 8.6596432336007e+00,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
283 1.0000000000000e+01, 1.1547819846895e+01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
284 1.3335214321633e+01, 1.5399265260595e+01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
285 1.7782794100389e+01, 2.0535250264571e+01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
286 2.3713737056617e+01, 2.7384196342644e+01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
287 3.1622776601684e+01, 3.6517412725484e+01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
288 4.2169650342858e+01, 4.8696752516586e+01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
289 5.6234132519035e+01, 6.4938163157621e+01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
290 7.4989420933246e+01, 8.6596432336007e+01,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
291 1.0000000000000e+02, 1.1547819846895e+02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
292 1.3335214321633e+02, 1.5399265260595e+02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
293 1.7782794100389e+02, 2.0535250264571e+02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
294 2.3713737056617e+02, 2.7384196342644e+02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
295 3.1622776601684e+02, 3.6517412725484e+02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
296 4.2169650342858e+02, 4.8696752516586e+02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
297 5.6234132519035e+02, 6.4938163157621e+02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
298 7.4989420933246e+02, 8.6596432336007e+02,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
299 1.0000000000000e+03, 1.1547819846895e+03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
300 1.3335214321633e+03, 1.5399265260595e+03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
301 1.7782794100389e+03, 2.0535250264571e+03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
302 2.3713737056617e+03, 2.7384196342644e+03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
303 3.1622776601684e+03, 3.6517412725484e+03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
304 4.2169650342858e+03, 4.8696752516586e+03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
305 5.6234132519035e+03, 6.4938163157621e+03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
306 7.4989420933246e+03, 8.6596432336007e+03,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
307 1.0000000000000e+04, 1.1547819846895e+04,
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
308 1.3335214321633e+04, 1.5399265260595e+04,
10561
d0e17b0a6845 WMA: extend exponent table up to 75
mru
parents: 10317
diff changeset
309 1.7782794100389e+04, 2.0535250264571e+04,
d0e17b0a6845 WMA: extend exponent table up to 75
mru
parents: 10317
diff changeset
310 2.3713737056617e+04, 2.7384196342644e+04,
d0e17b0a6845 WMA: extend exponent table up to 75
mru
parents: 10317
diff changeset
311 3.1622776601684e+04, 3.6517412725484e+04,
d0e17b0a6845 WMA: extend exponent table up to 75
mru
parents: 10317
diff changeset
312 4.2169650342858e+04, 4.8696752516586e+04,
10564
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
313 5.6234132519035e+04, 6.4938163157621e+04,
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
314 7.4989420933246e+04, 8.6596432336007e+04,
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
315 1.0000000000000e+05, 1.1547819846895e+05,
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
316 1.3335214321633e+05, 1.5399265260595e+05,
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
317 1.7782794100389e+05, 2.0535250264571e+05,
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
318 2.3713737056617e+05, 2.7384196342644e+05,
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
319 3.1622776601684e+05, 3.6517412725484e+05,
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
320 4.2169650342858e+05, 4.8696752516586e+05,
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
321 5.6234132519035e+05, 6.4938163157621e+05,
559ba9eabaff WMA: extend exponent range to 95
mru
parents: 10561
diff changeset
322 7.4989420933246e+05, 8.6596432336007e+05,
10312
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
323 };
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
324
4497
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
325 /**
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
326 * decode exponents coded with VLC codes
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
327 */
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
328 static int decode_exp_vlc(WMACodecContext *s, int ch)
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
329 {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
330 int last_exp, n, code;
10275
ae08043eb532 WMA: remove some unused variables
mru
parents: 10248
diff changeset
331 const uint16_t *ptr;
10313
f7376a522a7e WMA: use type punning and unroll loops in decode_exp_vlc()
mru
parents: 10312
diff changeset
332 float v, max_scale;
f7376a522a7e WMA: use type punning and unroll loops in decode_exp_vlc()
mru
parents: 10312
diff changeset
333 uint32_t *q, *q_end, iv;
10312
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
334 const float *ptab = pow_tab + 60;
10313
f7376a522a7e WMA: use type punning and unroll loops in decode_exp_vlc()
mru
parents: 10312
diff changeset
335 const uint32_t *iptab = (const uint32_t*)ptab;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
336
10275
ae08043eb532 WMA: remove some unused variables
mru
parents: 10248
diff changeset
337 ptr = s->exponent_bands[s->frame_len_bits - s->block_len_bits];
10313
f7376a522a7e WMA: use type punning and unroll loops in decode_exp_vlc()
mru
parents: 10312
diff changeset
338 q = (uint32_t *)s->exponents[ch];
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
339 q_end = q + s->block_len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
340 max_scale = 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
341 if (s->version == 1) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
342 last_exp = get_bits(&s->gb, 5) + 10;
10312
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
343 v = ptab[last_exp];
10313
f7376a522a7e WMA: use type punning and unroll loops in decode_exp_vlc()
mru
parents: 10312
diff changeset
344 iv = iptab[last_exp];
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
345 max_scale = v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
346 n = *ptr++;
10317
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
347 switch (n & 3) do {
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
348 case 0: *q++ = iv;
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
349 case 3: *q++ = iv;
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
350 case 2: *q++ = iv;
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
351 case 1: *q++ = iv;
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
352 } while ((n -= 4) > 0);
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
353 }else
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
354 last_exp = 36;
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
355
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
356 while (q < q_end) {
3113
ab01ee59324f - fix insufficient code length for exp_vlc
henry
parents: 3089
diff changeset
357 code = get_vlc2(&s->gb, s->exp_vlc.table, EXPVLCBITS, EXPMAX);
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
358 if (code < 0){
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
359 av_log(s->avctx, AV_LOG_ERROR, "Exponent vlc invalid\n");
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
360 return -1;
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
361 }
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
362 /* NOTE: this offset is the same as MPEG4 AAC ! */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
363 last_exp += code - 60;
10561
d0e17b0a6845 WMA: extend exponent table up to 75
mru
parents: 10317
diff changeset
364 if ((unsigned)last_exp + 60 > FF_ARRAY_ELEMS(pow_tab)) {
d0e17b0a6845 WMA: extend exponent table up to 75
mru
parents: 10317
diff changeset
365 av_log(s->avctx, AV_LOG_ERROR, "Exponent out of range: %d\n",
d0e17b0a6845 WMA: extend exponent table up to 75
mru
parents: 10317
diff changeset
366 last_exp);
10312
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
367 return -1;
10561
d0e17b0a6845 WMA: extend exponent table up to 75
mru
parents: 10317
diff changeset
368 }
10312
6aaf7c9e768b WMA: use a table instead of pow() in decode_exp_vlc
mru
parents: 10300
diff changeset
369 v = ptab[last_exp];
10313
f7376a522a7e WMA: use type punning and unroll loops in decode_exp_vlc()
mru
parents: 10312
diff changeset
370 iv = iptab[last_exp];
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
371 if (v > max_scale)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
372 max_scale = v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
373 n = *ptr++;
10317
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
374 switch (n & 3) do {
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
375 case 0: *q++ = iv;
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
376 case 3: *q++ = iv;
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
377 case 2: *q++ = iv;
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
378 case 1: *q++ = iv;
88e1eb862abd WMA: fix loop unrolling in decode_exp_vlc()
mru
parents: 10313
diff changeset
379 } while ((n -= 4) > 0);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
380 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
381 s->max_exponent[ch] = max_scale;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
382 return 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
383 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
384
4737
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
385
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
386 /**
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
387 * Apply MDCT window and add into output.
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
388 *
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
389 * We ensure that when the windows overlap their squared sum
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
390 * is always 1 (MDCT reconstruction rule).
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
391 */
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
392 static void wma_window(WMACodecContext *s, float *out)
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
393 {
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
394 float *in = s->output;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
395 int block_len, bsize, n;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
396
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
397 /* left part */
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
398 if (s->block_len_bits <= s->prev_block_len_bits) {
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
399 block_len = s->block_len;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
400 bsize = s->frame_len_bits - s->block_len_bits;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
401
10300
4d1b9ca628fc Drop unused args from vector_fmul_add_add, simpify code, and rename
mru
parents: 10275
diff changeset
402 s->dsp.vector_fmul_add(out, in, s->windows[bsize],
4d1b9ca628fc Drop unused args from vector_fmul_add_add, simpify code, and rename
mru
parents: 10275
diff changeset
403 out, block_len);
4737
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
404
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
405 } else {
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
406 block_len = 1 << s->prev_block_len_bits;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
407 n = (s->block_len - block_len) / 2;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
408 bsize = s->frame_len_bits - s->prev_block_len_bits;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
409
10300
4d1b9ca628fc Drop unused args from vector_fmul_add_add, simpify code, and rename
mru
parents: 10275
diff changeset
410 s->dsp.vector_fmul_add(out+n, in+n, s->windows[bsize],
4d1b9ca628fc Drop unused args from vector_fmul_add_add, simpify code, and rename
mru
parents: 10275
diff changeset
411 out+n, block_len);
4737
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
412
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
413 memcpy(out+n+block_len, in+n+block_len, n*sizeof(float));
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
414 }
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
415
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
416 out += s->block_len;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
417 in += s->block_len;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
418
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
419 /* right part */
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
420 if (s->block_len_bits <= s->next_block_len_bits) {
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
421 block_len = s->block_len;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
422 bsize = s->frame_len_bits - s->block_len_bits;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
423
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
424 s->dsp.vector_fmul_reverse(out, in, s->windows[bsize], block_len);
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
425
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
426 } else {
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
427 block_len = 1 << s->next_block_len_bits;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
428 n = (s->block_len - block_len) / 2;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
429 bsize = s->frame_len_bits - s->next_block_len_bits;
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
430
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
431 memcpy(out, in, n*sizeof(float));
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
432
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
433 s->dsp.vector_fmul_reverse(out+n, in+n, s->windows[bsize], block_len);
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
434
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
435 memset(out+n+block_len, 0, n*sizeof(float));
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
436 }
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
437 }
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
438
99d9dd34903b Optimize by building the mdct window and multipying/adding at the same time.
banan
parents: 4601
diff changeset
439
4497
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
440 /**
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
441 * @return 0 if OK. 1 if last block of frame. return -1 if
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
442 * unrecorrable error.
3975e734e07e doxygenize
michael
parents: 4491
diff changeset
443 */
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
444 static int wma_decode_block(WMACodecContext *s)
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
445 {
9844
eb5916527064 Move run level decode functionality to ff_wma_run_level_decode
faust3
parents: 9658
diff changeset
446 int n, v, a, ch, bsize;
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
447 int coef_nb_bits, total_gain;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
448 int nb_coefs[MAX_CHANNELS];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
449 float mdct_norm;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
450
1343
1fd083c620d6 moved frame_count to wmadeccontext
al3x
parents: 1342
diff changeset
451 #ifdef TRACE
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
452 tprintf(s->avctx, "***decode_block: %d:%d\n", s->frame_count - 1, s->block_num);
1343
1fd083c620d6 moved frame_count to wmadeccontext
al3x
parents: 1342
diff changeset
453 #endif
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
454
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
455 /* compute current block length */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
456 if (s->use_variable_block_len) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
457 n = av_log2(s->nb_block_sizes - 1) + 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
458
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
459 if (s->reset_block_lengths) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
460 s->reset_block_lengths = 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
461 v = get_bits(&s->gb, n);
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
462 if (v >= s->nb_block_sizes){
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
463 av_log(s->avctx, AV_LOG_ERROR, "prev_block_len_bits %d out of range\n", s->frame_len_bits - v);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
464 return -1;
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
465 }
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
466 s->prev_block_len_bits = s->frame_len_bits - v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
467 v = get_bits(&s->gb, n);
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
468 if (v >= s->nb_block_sizes){
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
469 av_log(s->avctx, AV_LOG_ERROR, "block_len_bits %d out of range\n", s->frame_len_bits - v);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
470 return -1;
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
471 }
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
472 s->block_len_bits = s->frame_len_bits - v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
473 } else {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
474 /* update block lengths */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
475 s->prev_block_len_bits = s->block_len_bits;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
476 s->block_len_bits = s->next_block_len_bits;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
477 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
478 v = get_bits(&s->gb, n);
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
479 if (v >= s->nb_block_sizes){
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
480 av_log(s->avctx, AV_LOG_ERROR, "next_block_len_bits %d out of range\n", s->frame_len_bits - v);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
481 return -1;
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
482 }
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
483 s->next_block_len_bits = s->frame_len_bits - v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
484 } else {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
485 /* fixed block len */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
486 s->next_block_len_bits = s->frame_len_bits;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
487 s->prev_block_len_bits = s->frame_len_bits;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
488 s->block_len_bits = s->frame_len_bits;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
489 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
490
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
491 /* now check if the block length is coherent with the frame length */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
492 s->block_len = 1 << s->block_len_bits;
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
493 if ((s->block_pos + s->block_len) > s->frame_len){
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
494 av_log(s->avctx, AV_LOG_ERROR, "frame_len overflow\n");
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
495 return -1;
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
496 }
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
497
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
498 if (s->nb_channels == 2) {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5089
diff changeset
499 s->ms_stereo = get_bits1(&s->gb);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
500 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
501 v = 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
502 for(ch = 0; ch < s->nb_channels; ch++) {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5089
diff changeset
503 a = get_bits1(&s->gb);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
504 s->channel_coded[ch] = a;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
505 v |= a;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
506 }
7243
158c8bc08f81 Fix not coded channels / silence decoding.
michael
parents: 7242
diff changeset
507
158c8bc08f81 Fix not coded channels / silence decoding.
michael
parents: 7242
diff changeset
508 bsize = s->frame_len_bits - s->block_len_bits;
158c8bc08f81 Fix not coded channels / silence decoding.
michael
parents: 7242
diff changeset
509
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
510 /* if no channel coded, no need to go further */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
511 /* XXX: fix potential framing problems */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
512 if (!v)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
513 goto next;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
514
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
515 /* read total gain and extract corresponding number of bits for
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
516 coef escape coding */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
517 total_gain = 1;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
518 for(;;) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
519 a = get_bits(&s->gb, 7);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
520 total_gain += a;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
521 if (a != 127)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
522 break;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
523 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
524
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
525 coef_nb_bits= ff_wma_total_gain_to_bits(total_gain);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
526
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
527 /* compute number of coefficients */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
528 n = s->coefs_end[bsize] - s->coefs_start;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
529 for(ch = 0; ch < s->nb_channels; ch++)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
530 nb_coefs[ch] = n;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
531
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
532 /* complex coding */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
533 if (s->use_noise_coding) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
534
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
535 for(ch = 0; ch < s->nb_channels; ch++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
536 if (s->channel_coded[ch]) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
537 int i, n, a;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
538 n = s->exponent_high_sizes[bsize];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
539 for(i=0;i<n;i++) {
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5089
diff changeset
540 a = get_bits1(&s->gb);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
541 s->high_band_coded[ch][i] = a;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
542 /* if noise coding, the coefficients are not transmitted */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
543 if (a)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
544 nb_coefs[ch] -= s->exponent_high_bands[bsize][i];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
545 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
546 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
547 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
548 for(ch = 0; ch < s->nb_channels; ch++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
549 if (s->channel_coded[ch]) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
550 int i, n, val, code;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
551
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
552 n = s->exponent_high_sizes[bsize];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
553 val = (int)0x80000000;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
554 for(i=0;i<n;i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
555 if (s->high_band_coded[ch][i]) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
556 if (val == (int)0x80000000) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
557 val = get_bits(&s->gb, 7) - 19;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
558 } else {
3113
ab01ee59324f - fix insufficient code length for exp_vlc
henry
parents: 3089
diff changeset
559 code = get_vlc2(&s->gb, s->hgain_vlc.table, HGAINVLCBITS, HGAINMAX);
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
560 if (code < 0){
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
561 av_log(s->avctx, AV_LOG_ERROR, "hgain vlc invalid\n");
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
562 return -1;
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
563 }
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
564 val += code - 18;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
565 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
566 s->high_band_values[ch][i] = val;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
567 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
568 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
569 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
570 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
571 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
572
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
573 /* exponents can be reused in short blocks. */
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
574 if ((s->block_len_bits == s->frame_len_bits) ||
5513
9f8219a3b86f use get_bits1(..) instead get_bits(.., 1)
alex
parents: 5089
diff changeset
575 get_bits1(&s->gb)) {
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
576 for(ch = 0; ch < s->nb_channels; ch++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
577 if (s->channel_coded[ch]) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
578 if (s->use_exp_vlc) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
579 if (decode_exp_vlc(s, ch) < 0)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
580 return -1;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
581 } else {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
582 decode_exp_lsp(s, ch);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
583 }
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
584 s->exponents_bsize[ch] = bsize;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
585 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
586 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
587 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
588
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
589 /* parse spectral coefficients : just RLE encoding */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
590 for(ch = 0; ch < s->nb_channels; ch++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
591 if (s->channel_coded[ch]) {
9844
eb5916527064 Move run level decode functionality to ff_wma_run_level_decode
faust3
parents: 9658
diff changeset
592 int tindex;
9868
5cc32c474caf Introduce WMACoef typedef for decoded coefficients
faust3
parents: 9844
diff changeset
593 WMACoef* ptr = &s->coefs1[ch][0];
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
594
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
595 /* special VLC tables are used for ms stereo because
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
596 there is potentially less energy there */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
597 tindex = (ch == 1 && s->ms_stereo);
9868
5cc32c474caf Introduce WMACoef typedef for decoded coefficients
faust3
parents: 9844
diff changeset
598 memset(ptr, 0, s->block_len * sizeof(WMACoef));
9844
eb5916527064 Move run level decode functionality to ff_wma_run_level_decode
faust3
parents: 9658
diff changeset
599 ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex],
eb5916527064 Move run level decode functionality to ff_wma_run_level_decode
faust3
parents: 9658
diff changeset
600 s->level_table[tindex], s->run_table[tindex],
eb5916527064 Move run level decode functionality to ff_wma_run_level_decode
faust3
parents: 9658
diff changeset
601 0, ptr, 0, nb_coefs[ch],
eb5916527064 Move run level decode functionality to ff_wma_run_level_decode
faust3
parents: 9658
diff changeset
602 s->block_len, s->frame_len_bits, coef_nb_bits);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
603 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
604 if (s->version == 1 && s->nb_channels >= 2) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
605 align_get_bits(&s->gb);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
606 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
607 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
608
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
609 /* normalize */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
610 {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
611 int n4 = s->block_len / 2;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
612 mdct_norm = 1.0 / (float)n4;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
613 if (s->version == 1) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
614 mdct_norm *= sqrt(n4);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
615 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
616 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
617
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
618 /* finally compute the MDCT coefficients */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
619 for(ch = 0; ch < s->nb_channels; ch++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
620 if (s->channel_coded[ch]) {
9868
5cc32c474caf Introduce WMACoef typedef for decoded coefficients
faust3
parents: 9844
diff changeset
621 WMACoef *coefs1;
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
622 float *coefs, *exponents, mult, mult1, noise;
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
623 int i, j, n, n1, last_high_band, esize;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
624 float exp_power[HIGH_BAND_MAX_SIZE];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
625
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
626 coefs1 = s->coefs1[ch];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
627 exponents = s->exponents[ch];
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
628 esize = s->exponents_bsize[ch];
3235
d3c05c7dabcd reverting 1.31->1.33
michael
parents: 3195
diff changeset
629 mult = pow(10, total_gain * 0.05) / s->max_exponent[ch];
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
630 mult *= mdct_norm;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
631 coefs = s->coefs[ch];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
632 if (s->use_noise_coding) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
633 mult1 = mult;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
634 /* very low freqs : noise */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
635 for(i = 0;i < s->coefs_start; i++) {
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
636 *coefs++ = s->noise_table[s->noise_index] *
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
637 exponents[i<<bsize>>esize] * mult1;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
638 s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
639 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
640
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
641 n1 = s->exponent_high_sizes[bsize];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
642
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
643 /* compute power of high bands */
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
644 exponents = s->exponents[ch] +
10653
50c21a46538f Fix apparent 10l typos introduced in r8627.
michael
parents: 10564
diff changeset
645 (s->high_band_start[bsize]<<bsize>>esize);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
646 last_high_band = 0; /* avoid warning */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
647 for(j=0;j<n1;j++) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
648 n = s->exponent_high_bands[s->frame_len_bits -
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
649 s->block_len_bits][j];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
650 if (s->high_band_coded[ch][j]) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
651 float e2, v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
652 e2 = 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
653 for(i = 0;i < n; i++) {
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
654 v = exponents[i<<bsize>>esize];
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
655 e2 += v * v;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
656 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
657 exp_power[j] = e2 / n;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
658 last_high_band = j;
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
659 tprintf(s->avctx, "%d: power=%f (%d)\n", j, exp_power[j], n);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
660 }
10653
50c21a46538f Fix apparent 10l typos introduced in r8627.
michael
parents: 10564
diff changeset
661 exponents += n<<bsize>>esize;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
662 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
663
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
664 /* main freqs and high freqs */
10653
50c21a46538f Fix apparent 10l typos introduced in r8627.
michael
parents: 10564
diff changeset
665 exponents = s->exponents[ch] + (s->coefs_start<<bsize>>esize);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
666 for(j=-1;j<n1;j++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
667 if (j < 0) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
668 n = s->high_band_start[bsize] -
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
669 s->coefs_start;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
670 } else {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
671 n = s->exponent_high_bands[s->frame_len_bits -
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
672 s->block_len_bits][j];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
673 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
674 if (j >= 0 && s->high_band_coded[ch][j]) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
675 /* use noise with specified power */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
676 mult1 = sqrt(exp_power[j] / exp_power[last_high_band]);
3235
d3c05c7dabcd reverting 1.31->1.33
michael
parents: 3195
diff changeset
677 /* XXX: use a table */
d3c05c7dabcd reverting 1.31->1.33
michael
parents: 3195
diff changeset
678 mult1 = mult1 * pow(10, s->high_band_values[ch][j] * 0.05);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
679 mult1 = mult1 / (s->max_exponent[ch] * s->noise_mult);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
680 mult1 *= mdct_norm;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
681 for(i = 0;i < n; i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
682 noise = s->noise_table[s->noise_index];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
683 s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1);
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
684 *coefs++ = noise *
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
685 exponents[i<<bsize>>esize] * mult1;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
686 }
10653
50c21a46538f Fix apparent 10l typos introduced in r8627.
michael
parents: 10564
diff changeset
687 exponents += n<<bsize>>esize;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
688 } else {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
689 /* coded values + small noise */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
690 for(i = 0;i < n; i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
691 noise = s->noise_table[s->noise_index];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
692 s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1);
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
693 *coefs++ = ((*coefs1++) + noise) *
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
694 exponents[i<<bsize>>esize] * mult;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
695 }
10653
50c21a46538f Fix apparent 10l typos introduced in r8627.
michael
parents: 10564
diff changeset
696 exponents += n<<bsize>>esize;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
697 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
698 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
699
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
700 /* very high freqs : noise */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
701 n = s->block_len - s->coefs_end[bsize];
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
702 mult1 = mult * exponents[((-1<<bsize))>>esize];
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
703 for(i = 0; i < n; i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
704 *coefs++ = s->noise_table[s->noise_index] * mult1;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
705 s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
706 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
707 } else {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
708 /* XXX: optimize more */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
709 for(i = 0;i < s->coefs_start; i++)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
710 *coefs++ = 0.0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
711 n = nb_coefs[ch];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
712 for(i = 0;i < n; i++) {
4785
4ae9ab738aec WMA decoder improvement, output closer to the dmo binary.
banan
parents: 4737
diff changeset
713 *coefs++ = coefs1[i] * exponents[i<<bsize>>esize] * mult;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
714 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
715 n = s->block_len - s->coefs_end[bsize];
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
716 for(i = 0;i < n; i++)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
717 *coefs++ = 0.0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
718 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
719 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
720 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
721
1342
f574934c4219 uniformization (now it uses the same trace functions as h264, defined in common.h)
al3x
parents: 1303
diff changeset
722 #ifdef TRACE
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
723 for(ch = 0; ch < s->nb_channels; ch++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
724 if (s->channel_coded[ch]) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
725 dump_floats(s, "exponents", 3, s->exponents[ch], s->block_len);
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
726 dump_floats(s, "coefs", 1, s->coefs[ch], s->block_len);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
727 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
728 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
729 #endif
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
730
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
731 if (s->ms_stereo && s->channel_coded[1]) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
732 /* nominal case for ms stereo: we do it before mdct */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
733 /* no need to optimize this case because it should almost
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
734 never happen */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
735 if (!s->channel_coded[0]) {
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
736 tprintf(s->avctx, "rare ms-stereo case happened\n");
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
737 memset(s->coefs[0], 0, sizeof(float) * s->block_len);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
738 s->channel_coded[0] = 1;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
739 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
740
10236
0e9a50fbed9f WMA: use DSPContext.butterflies_float
mru
parents: 9868
diff changeset
741 s->dsp.butterflies_float(s->coefs[0], s->coefs[1], s->block_len);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
742 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
743
7243
158c8bc08f81 Fix not coded channels / silence decoding.
michael
parents: 7242
diff changeset
744 next:
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
745 for(ch = 0; ch < s->nb_channels; ch++) {
9472
05663d250d5b Remove unused variable from wma_decode_block() found by CSA.
michael
parents: 9355
diff changeset
746 int n4, index;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
747
7244
michael
parents: 7243
diff changeset
748 n4 = s->block_len / 2;
michael
parents: 7243
diff changeset
749 if(s->channel_coded[ch]){
7547
8226017a65ae mdct wrapper function to match fft
lorenm
parents: 7546
diff changeset
750 ff_imdct_calc(&s->mdct_ctx[bsize], s->output, s->coefs[ch]);
7712
7c22b99dbf5e Fix mid/side stereo buggy output zeroing, fixes issue264 part 2.
michael
parents: 7547
diff changeset
751 }else if(!(s->ms_stereo && ch==1))
7244
michael
parents: 7243
diff changeset
752 memset(s->output, 0, sizeof(s->output));
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
753
7244
michael
parents: 7243
diff changeset
754 /* multiply by the window and add in the frame */
michael
parents: 7243
diff changeset
755 index = (s->frame_len / 2) + s->block_pos - n4;
michael
parents: 7243
diff changeset
756 wma_window(s, &s->frame_out[ch][index]);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
757 }
7243
158c8bc08f81 Fix not coded channels / silence decoding.
michael
parents: 7242
diff changeset
758
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
759 /* update block number */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
760 s->block_num++;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
761 s->block_pos += s->block_len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
762 if (s->block_pos >= s->frame_len)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
763 return 1;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
764 else
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
765 return 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
766 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
767
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
768 /* decode a frame of frame_len samples */
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
769 static int wma_decode_frame(WMACodecContext *s, int16_t *samples)
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
770 {
5525
bc4791868c52 various simplifications around recent av_clip_int16() usage
aurel
parents: 5523
diff changeset
771 int ret, i, n, ch, incr;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
772 int16_t *ptr;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
773 float *iptr;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
774
1343
1fd083c620d6 moved frame_count to wmadeccontext
al3x
parents: 1342
diff changeset
775 #ifdef TRACE
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
776 tprintf(s->avctx, "***decode_frame: %d size=%d\n", s->frame_count++, s->frame_len);
1343
1fd083c620d6 moved frame_count to wmadeccontext
al3x
parents: 1342
diff changeset
777 #endif
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
778
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
779 /* read each block */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
780 s->block_num = 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
781 s->block_pos = 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
782 for(;;) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
783 ret = wma_decode_block(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
784 if (ret < 0)
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
785 return -1;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
786 if (ret)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
787 break;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
788 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
789
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
790 /* convert frame to integer */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
791 n = s->frame_len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
792 incr = s->nb_channels;
11451
01559518729e SIMD optimization using float_to_int16_interleave.
cehoyos
parents: 11215
diff changeset
793 if (s->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
11452
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
794 for(ch = 0; ch < s->nb_channels; ch++) {
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
795 ptr = samples + ch;
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
796 iptr = s->frame_out[ch];
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
797
11452
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
798 for(i=0;i<n;i++) {
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
799 *ptr = av_clip_int16(lrintf(*iptr++));
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
800 ptr += incr;
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
801 }
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
802 /* prepare for next block */
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
803 memmove(&s->frame_out[ch][0], &s->frame_out[ch][s->frame_len],
d5673aafc6bf Fix indentation after r22414.
cehoyos
parents: 11451
diff changeset
804 s->frame_len * sizeof(float));
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
805 }
11451
01559518729e SIMD optimization using float_to_int16_interleave.
cehoyos
parents: 11215
diff changeset
806 } else {
12101
ab330d7112ad Silence warning "new qualifiers in middle of multi-level
cehoyos
parents: 11644
diff changeset
807 const float *output[MAX_CHANNELS];
11451
01559518729e SIMD optimization using float_to_int16_interleave.
cehoyos
parents: 11215
diff changeset
808 for (ch = 0; ch < MAX_CHANNELS; ch++)
01559518729e SIMD optimization using float_to_int16_interleave.
cehoyos
parents: 11215
diff changeset
809 output[ch] = s->frame_out[ch];
12101
ab330d7112ad Silence warning "new qualifiers in middle of multi-level
cehoyos
parents: 11644
diff changeset
810 s->dsp.float_to_int16_interleave(samples, output, n, incr);
11451
01559518729e SIMD optimization using float_to_int16_interleave.
cehoyos
parents: 11215
diff changeset
811 for(ch = 0; ch < incr; ch++) {
01559518729e SIMD optimization using float_to_int16_interleave.
cehoyos
parents: 11215
diff changeset
812 /* prepare for next block */
01559518729e SIMD optimization using float_to_int16_interleave.
cehoyos
parents: 11215
diff changeset
813 memmove(&s->frame_out[ch][0], &s->frame_out[ch][n], n * sizeof(float));
01559518729e SIMD optimization using float_to_int16_interleave.
cehoyos
parents: 11215
diff changeset
814 }
01559518729e SIMD optimization using float_to_int16_interleave.
cehoyos
parents: 11215
diff changeset
815 }
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
816
1342
f574934c4219 uniformization (now it uses the same trace functions as h264, defined in common.h)
al3x
parents: 1303
diff changeset
817 #ifdef TRACE
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
818 dump_shorts(s, "samples", samples, n * s->nb_channels);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
819 #endif
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
820 return 0;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
821 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
822
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
823 static int wma_decode_superframe(AVCodecContext *avctx,
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
824 void *data, int *data_size,
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
825 AVPacket *avpkt)
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
826 {
9355
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
827 const uint8_t *buf = avpkt->data;
54bc8a2727b0 Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
rbultje
parents: 8718
diff changeset
828 int buf_size = avpkt->size;
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
829 WMACodecContext *s = avctx->priv_data;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
830 int nb_frames, bit_offset, i, pos, len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
831 uint8_t *q;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
832 int16_t *samples;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
833
4600
6ac364a4ce2b Supply context to tprintf
mbardiaux
parents: 4497
diff changeset
834 tprintf(avctx, "***decode_superframe:\n");
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
835
1750
610617f1dbd0 segfault fix
michael
parents: 1343
diff changeset
836 if(buf_size==0){
610617f1dbd0 segfault fix
michael
parents: 1343
diff changeset
837 s->last_superframe_len = 0;
610617f1dbd0 segfault fix
michael
parents: 1343
diff changeset
838 return 0;
610617f1dbd0 segfault fix
michael
parents: 1343
diff changeset
839 }
5957
0f2c4fa2c4f2 wma_decode_superframe always returns s->block_align, so make
reimar
parents: 5525
diff changeset
840 if (buf_size < s->block_align)
0f2c4fa2c4f2 wma_decode_superframe always returns s->block_align, so make
reimar
parents: 5525
diff changeset
841 return 0;
0f2c4fa2c4f2 wma_decode_superframe always returns s->block_align, so make
reimar
parents: 5525
diff changeset
842 buf_size = s->block_align;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
843
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
844 samples = data;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
845
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 972
diff changeset
846 init_get_bits(&s->gb, buf, buf_size*8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
847
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
848 if (s->use_bit_reservoir) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
849 /* read super frame header */
5518
d2ef80f5fd7e use skip_bits where appropriate
alex
parents: 5517
diff changeset
850 skip_bits(&s->gb, 4); /* super frame index */
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
851 nb_frames = get_bits(&s->gb, 4) - 1;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
852
7242
d90bc6cc1bfd Check that we have enough output space available.
michael
parents: 7040
diff changeset
853 if((nb_frames+1) * s->nb_channels * s->frame_len * sizeof(int16_t) > *data_size){
d90bc6cc1bfd Check that we have enough output space available.
michael
parents: 7040
diff changeset
854 av_log(s->avctx, AV_LOG_ERROR, "Insufficient output space\n");
d90bc6cc1bfd Check that we have enough output space available.
michael
parents: 7040
diff changeset
855 goto fail;
d90bc6cc1bfd Check that we have enough output space available.
michael
parents: 7040
diff changeset
856 }
d90bc6cc1bfd Check that we have enough output space available.
michael
parents: 7040
diff changeset
857
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
858 bit_offset = get_bits(&s->gb, s->byte_offset_bits + 3);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
859
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
860 if (s->last_superframe_len > 0) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
861 // printf("skip=%d\n", s->last_bitoffset);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
862 /* add bit_offset bits to last frame */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
863 if ((s->last_superframe_len + ((bit_offset + 7) >> 3)) >
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
864 MAX_CODED_SUPERFRAME_SIZE)
964
6e6773512288 oops : better error resilience - should fix most wma decoding problems
bellard
parents: 819
diff changeset
865 goto fail;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
866 q = s->last_superframe + s->last_superframe_len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
867 len = bit_offset;
3362
c43fcf831f7c Do not read full byte when less than 8 bits are still to be read.
reimar
parents: 3361
diff changeset
868 while (len > 7) {
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
869 *q++ = (get_bits)(&s->gb, 8);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
870 len -= 8;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
871 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
872 if (len > 0) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
873 *q++ = (get_bits)(&s->gb, len) << (8 - len);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
874 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
875
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
876 /* XXX: bit_offset bits into last frame */
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 972
diff changeset
877 init_get_bits(&s->gb, s->last_superframe, MAX_CODED_SUPERFRAME_SIZE*8);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
878 /* skip unused bits */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
879 if (s->last_bitoffset > 0)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
880 skip_bits(&s->gb, s->last_bitoffset);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
881 /* this frame is stored in the last superframe and in the
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
882 current one */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
883 if (wma_decode_frame(s, samples) < 0)
964
6e6773512288 oops : better error resilience - should fix most wma decoding problems
bellard
parents: 819
diff changeset
884 goto fail;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
885 samples += s->nb_channels * s->frame_len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
886 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
887
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
888 /* read each frame starting from bit_offset */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
889 pos = bit_offset + 4 + 4 + s->byte_offset_bits + 3;
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 972
diff changeset
890 init_get_bits(&s->gb, buf + (pos >> 3), (MAX_CODED_SUPERFRAME_SIZE - (pos >> 3))*8);
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
891 len = pos & 7;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
892 if (len > 0)
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
893 skip_bits(&s->gb, len);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2775
diff changeset
894
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
895 s->reset_block_lengths = 1;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
896 for(i=0;i<nb_frames;i++) {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
897 if (wma_decode_frame(s, samples) < 0)
964
6e6773512288 oops : better error resilience - should fix most wma decoding problems
bellard
parents: 819
diff changeset
898 goto fail;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
899 samples += s->nb_channels * s->frame_len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
900 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
901
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
902 /* we copy the end of the frame in the last frame buffer */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
903 pos = get_bits_count(&s->gb) + ((bit_offset + 4 + 4 + s->byte_offset_bits + 3) & ~7);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
904 s->last_bitoffset = pos & 7;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
905 pos >>= 3;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
906 len = buf_size - pos;
819
ae89deb3a97d * avoid negative numbers as well
kabi
parents: 818
diff changeset
907 if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0) {
10654
2dbb341a14ba Print error messages on errors.
michael
parents: 10653
diff changeset
908 av_log(s->avctx, AV_LOG_ERROR, "len %d invalid\n", len);
964
6e6773512288 oops : better error resilience - should fix most wma decoding problems
bellard
parents: 819
diff changeset
909 goto fail;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
910 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
911 s->last_superframe_len = len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
912 memcpy(s->last_superframe, buf + pos, len);
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
913 } else {
7242
d90bc6cc1bfd Check that we have enough output space available.
michael
parents: 7040
diff changeset
914 if(s->nb_channels * s->frame_len * sizeof(int16_t) > *data_size){
d90bc6cc1bfd Check that we have enough output space available.
michael
parents: 7040
diff changeset
915 av_log(s->avctx, AV_LOG_ERROR, "Insufficient output space\n");
d90bc6cc1bfd Check that we have enough output space available.
michael
parents: 7040
diff changeset
916 goto fail;
d90bc6cc1bfd Check that we have enough output space available.
michael
parents: 7040
diff changeset
917 }
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
918 /* single frame decode */
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
919 if (wma_decode_frame(s, samples) < 0)
964
6e6773512288 oops : better error resilience - should fix most wma decoding problems
bellard
parents: 819
diff changeset
920 goto fail;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
921 samples += s->nb_channels * s->frame_len;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
922 }
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
923
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
924 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d outbytes:%d eaten:%d\n", s->frame_len_bits, s->block_len_bits, s->frame_len, s->block_len, (int8_t *)samples - (int8_t *)data, s->block_align);
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
925
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
926 *data_size = (int8_t *)samples - (int8_t *)data;
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
927 return s->block_align;
964
6e6773512288 oops : better error resilience - should fix most wma decoding problems
bellard
parents: 819
diff changeset
928 fail:
6e6773512288 oops : better error resilience - should fix most wma decoding problems
bellard
parents: 819
diff changeset
929 /* when error, we reset the bit reservoir */
6e6773512288 oops : better error resilience - should fix most wma decoding problems
bellard
parents: 819
diff changeset
930 s->last_superframe_len = 0;
6e6773512288 oops : better error resilience - should fix most wma decoding problems
bellard
parents: 819
diff changeset
931 return -1;
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
932 }
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
933
11062
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
934 static av_cold void flush(AVCodecContext *avctx)
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
935 {
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
936 WMACodecContext *s = avctx->priv_data;
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
937
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
938 s->last_bitoffset=
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
939 s->last_superframe_len= 0;
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
940 }
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
941
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
942 AVCodec wmav1_decoder =
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
943 {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
944 "wmav1",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11452
diff changeset
945 AVMEDIA_TYPE_AUDIO,
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
946 CODEC_ID_WMAV1,
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
947 sizeof(WMACodecContext),
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
948 wma_decode_init,
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
949 NULL,
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
950 ff_wma_end,
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
951 wma_decode_superframe,
11062
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
952 .flush=flush,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6710
diff changeset
953 .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
954 };
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
955
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
956 AVCodec wmav2_decoder =
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
957 {
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
958 "wmav2",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11452
diff changeset
959 AVMEDIA_TYPE_AUDIO,
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
960 CODEC_ID_WMAV2,
4601
7b9ce6f729ae Rename WMADecodeContext to WMACodecContext
mbardiaux
parents: 4600
diff changeset
961 sizeof(WMACodecContext),
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
962 wma_decode_init,
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
963 NULL,
4490
0efc832d9102 wma encoder
michael
parents: 4301
diff changeset
964 ff_wma_end,
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
965 wma_decode_superframe,
11062
a8e640f4f388 Flush the bitreservour.
michael
parents: 10654
diff changeset
966 .flush=flush,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6710
diff changeset
967 .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
783
b6eefd714bf3 added wma decoder
bellard
parents:
diff changeset
968 };