summaryrefslogtreecommitdiff
path: root/libavcodec/mpegaudiodec_float.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-05-19 13:36:21 +0100
committerMans Rullgard <mans@mansr.com>2011-05-31 15:30:21 +0100
commit6f1ec38ce2193d3d4cacd87edb452c6d7ba751ec (patch)
tree571caf9eef256f41285d11427d21a6e9635b8cab /libavcodec/mpegaudiodec_float.c
parent9ebcf7699bced12d4b7e326cfbb1f9ffb59ec794 (diff)
downloadffmpeg-6f1ec38ce2193d3d4cacd87edb452c6d7ba751ec.tar.gz
mpegaudio: clean up compute_antialias() definition
This merges the float and fixed-point versions of the compute_antialias function, fixes invalid array indexing, and eliminates a dead copy of csa_table. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/mpegaudiodec_float.c')
-rw-r--r--libavcodec/mpegaudiodec_float.c39
1 files changed, 0 insertions, 39 deletions
diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c
index 94463a824e..0ff866af31 100644
--- a/libavcodec/mpegaudiodec_float.c
+++ b/libavcodec/mpegaudiodec_float.c
@@ -22,45 +22,6 @@
#define CONFIG_FLOAT 1
#include "mpegaudiodec.c"
-static void compute_antialias_float(MPADecodeContext *s,
- GranuleDef *g)
-{
- float *ptr;
- int n, i;
-
- /* we antialias only "long" bands */
- if (g->block_type == 2) {
- if (!g->switch_point)
- return;
- /* XXX: check this for 8000Hz case */
- n = 1;
- } else {
- n = SBLIMIT - 1;
- }
-
- ptr = g->sb_hybrid + 18;
- for(i = n;i > 0;i--) {
- float tmp0, tmp1;
- float *csa = &csa_table_float[0][0];
-#define FLOAT_AA(j)\
- tmp0= ptr[-1-j];\
- tmp1= ptr[ j];\
- ptr[-1-j] = tmp0 * csa[0+4*j] - tmp1 * csa[1+4*j];\
- ptr[ j] = tmp0 * csa[1+4*j] + tmp1 * csa[0+4*j];
-
- FLOAT_AA(0)
- FLOAT_AA(1)
- FLOAT_AA(2)
- FLOAT_AA(3)
- FLOAT_AA(4)
- FLOAT_AA(5)
- FLOAT_AA(6)
- FLOAT_AA(7)
-
- ptr += 18;
- }
-}
-
#if CONFIG_MP1FLOAT_DECODER
AVCodec ff_mp1float_decoder =
{