aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2008-09-04 15:04:08 +0000
committerVitor Sessak <vitor1001@gmail.com>2008-09-04 15:04:08 +0000
commit1775c7fac6f70f77986dc8adab674b6d4510c7f7 (patch)
treee9925c5a8430c6776ff779d68326f99dea4c88f6
parente4b8f1fa77e048eae8c6e3caee9ac495302a36aa (diff)
downloadffmpeg-1775c7fac6f70f77986dc8adab674b6d4510c7f7.tar.gz
Multiply table by -1. This avoid doing this calculation (that was introduced
in my last commit) in real time. Originally committed as revision 15195 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/aac.c2
-rw-r--r--libavcodec/aacdectab.h18
2 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 94f27acda1..c59a663bec 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -635,7 +635,7 @@ static int decode_tns(AACContext * ac, TemporalNoiseShaping * tns,
tmp2_idx = 2*coef_compress + coef_res;
for (i = 0; i < tns->order[w][filt]; i++)
- tns->coef[w][filt][i] = -tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
+ tns->coef[w][filt][i] = tns_tmp2_map[tmp2_idx][get_bits(gb, coef_len)];
}
}
}
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h
index e4b87d79a0..32f1aa4765 100644
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aacdectab.h
@@ -178,24 +178,24 @@ static const uint8_t tns_max_bands_128[] = {
* @{
*/
static const float tns_tmp2_map_1_3[4] = {
- 0.00000000, 0.43388373, -0.64278758, -0.34202015,
+ 0.00000000, -0.43388373, 0.64278758, 0.34202015,
};
static const float tns_tmp2_map_0_3[8] = {
- 0.00000000, 0.43388373, 0.78183150, 0.97492790,
- -0.98480773, -0.86602539, -0.64278758, -0.34202015,
+ 0.00000000, -0.43388373, -0.78183150, -0.97492790,
+ 0.98480773, 0.86602539, 0.64278758, 0.34202015,
};
static const float tns_tmp2_map_1_4[8] = {
- 0.00000000, 0.20791170, 0.40673664, 0.58778524,
- -0.67369562, -0.52643216, -0.36124167, -0.18374951,
+ 0.00000000, -0.20791170, -0.40673664, -0.58778524,
+ 0.67369562, 0.52643216, 0.36124167, 0.18374951,
};
static const float tns_tmp2_map_0_4[16] = {
- 0.00000000, 0.20791170, 0.40673664, 0.58778524,
- 0.74314481, 0.86602539, 0.95105654, 0.99452192,
- -0.99573416, -0.96182561, -0.89516330, -0.79801720,
- -0.67369562, -0.52643216, -0.36124167, -0.18374951,
+ 0.00000000, -0.20791170, -0.40673664, -0.58778524,
+ -0.74314481, -0.86602539, -0.95105654, -0.99452192,
+ 0.99573416, 0.96182561, 0.89516330, 0.79801720,
+ 0.67369562, 0.52643216, 0.36124167, 0.18374951,
};
static const float *tns_tmp2_map[4] = {