diff options
Diffstat (limited to 'apps/codecs/libmad')
-rw-r--r-- | apps/codecs/libmad/SOURCES | 1 | ||||
-rw-r--r-- | apps/codecs/libmad/libmad.make | 13 | ||||
-rw-r--r-- | apps/codecs/libmad/synth.c | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/apps/codecs/libmad/SOURCES b/apps/codecs/libmad/SOURCES index b7e1957326..a4ffcb5c64 100644 --- a/apps/codecs/libmad/SOURCES +++ b/apps/codecs/libmad/SOURCES | |||
@@ -14,6 +14,5 @@ imdct_mcf5249.S | |||
14 | #endif | 14 | #endif |
15 | #if defined(CPU_ARM) | 15 | #if defined(CPU_ARM) |
16 | imdct_l_arm.S | 16 | imdct_l_arm.S |
17 | dct32_arm.S | ||
18 | synth_full_arm.S | 17 | synth_full_arm.S |
19 | #endif | 18 | #endif |
diff --git a/apps/codecs/libmad/libmad.make b/apps/codecs/libmad/libmad.make index 331ee8916f..58d2dc84e6 100644 --- a/apps/codecs/libmad/libmad.make +++ b/apps/codecs/libmad/libmad.make | |||
@@ -11,7 +11,18 @@ | |||
11 | # (one for codec, one for mpegplayer) | 11 | # (one for codec, one for mpegplayer) |
12 | # so a little trickery is necessary | 12 | # so a little trickery is necessary |
13 | 13 | ||
14 | MADFLAGS = $(CODECFLAGS) -UDEBUG -DNDEBUG -O2 -I$(APPSDIR)/codecs/libmad -DHAVE_LIMITS_H | 14 | # Extract optimization level ('-O') from compile flags. Will be set later. |
15 | MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmad | ||
16 | MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H | ||
17 | |||
18 | # libmad is faster on ARM-targets with -O1 than -O2 | ||
19 | ifeq ($(CPU),arm) | ||
20 | MADFLAGS += -O1 | ||
21 | else | ||
22 | MADFLAGS += -O2 | ||
23 | endif | ||
24 | |||
25 | # MPEGplayer | ||
15 | MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER | 26 | MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER |
16 | 27 | ||
17 | # libmad | 28 | # libmad |
diff --git a/apps/codecs/libmad/synth.c b/apps/codecs/libmad/synth.c index 7f1c2e6fc0..5ae9811ead 100644 --- a/apps/codecs/libmad/synth.c +++ b/apps/codecs/libmad/synth.c | |||
@@ -67,7 +67,8 @@ void mad_synth_mute(struct mad_synth *synth) | |||
67 | } | 67 | } |
68 | } | 68 | } |
69 | 69 | ||
70 | #ifdef FPM_ARM | 70 | #if 0 /* dct32 asm implementation is slower on current arm systems */ |
71 | /* #ifdef FPM_ARM */ | ||
71 | 72 | ||
72 | void dct32(mad_fixed_t const in[32], unsigned int slot, | 73 | void dct32(mad_fixed_t const in[32], unsigned int slot, |
73 | mad_fixed_t lo[16][8], mad_fixed_t hi[16][8]); | 74 | mad_fixed_t lo[16][8], mad_fixed_t hi[16][8]); |