summaryrefslogtreecommitdiff
path: root/apps/codecs/libwma/wmadec.h
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-05-20 22:53:22 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-05-20 22:53:22 +0000
commit99494140daebe8ac854eedf6173ec363765193d8 (patch)
treead412d276f2bb7216c5dbbb3bfa1e59ec6c6c614 /apps/codecs/libwma/wmadec.h
parent89e791cc4b7956e84459b71a398b037a089636c4 (diff)
Use more IRAM on S5L870x to speed up wma by ~3%.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29905 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libwma/wmadec.h')
-rw-r--r--apps/codecs/libwma/wmadec.h21
1 files changed, 16 insertions, 5 deletions
diff --git a/apps/codecs/libwma/wmadec.h b/apps/codecs/libwma/wmadec.h
index d7fa79d268..76429dede1 100644
--- a/apps/codecs/libwma/wmadec.h
+++ b/apps/codecs/libwma/wmadec.h
@@ -51,16 +51,27 @@
#define LSP_POW_BITS 7
-/*define IRAM for targets with 48k/80k IRAM split*/
-#ifndef IBSS_ATTR_WMA_LARGE_IRAM
-#if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || defined(CPU_S5L870X) || (CONFIG_CPU == MCF5250)
-/* PP5022/24, MCF5250 have 128KB of IRAM. 80KB are allocated for codecs */
+
+#if (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || (CONFIG_CPU == MCF5250)
+/* PP5022/24 and MCF5250 have 128KB of IRAM. 80KB are allocated for codecs */
+#define IBSS_ATTR_WMA_LARGE_IRAM IBSS_ATTR
+#define IBSS_ATTR_WMA_XL_IRAM
+#define ICONST_ATTR_WMA_XL_IRAM
+
+#elif defined(CPU_S5L870X)
+/* S5L870x has even more IRAM. Use it. */
#define IBSS_ATTR_WMA_LARGE_IRAM IBSS_ATTR
+#define IBSS_ATTR_WMA_XL_IRAM IBSS_ATTR
+#define ICONST_ATTR_WMA_XL_IRAM ICONST_ATTR
+
#else
/* other PP's and MCF5249 have 96KB of IRAM */
#define IBSS_ATTR_WMA_LARGE_IRAM
+#define IBSS_ATTR_WMA_XL_IRAM
+#define ICONST_ATTR_WMA_XL_IRAM
+
#endif
-#endif
+
#define VLCBITS 7 /*7 is the lowest without glitching*/
#define VLCMAX ((22+VLCBITS-1)/VLCBITS)