summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-05-21 20:39:22 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-05-21 20:39:22 -0400
commit9b43f14165cdb4fd77a5e9c8a1213486dcb8ca67 (patch)
tree9d07fd76dadb2cfcdcb39cc8a58a916c37ac7cfb /lib
parented24e620290ad5290fc4178f13e5c7cf611a76e0 (diff)
downloadrockbox-9b43f14165cdb4fd77a5e9c8a1213486dcb8ca67.tar.gz
rockbox-9b43f14165cdb4fd77a5e9c8a1213486dcb8ca67.tar.bz2
rockbox-9b43f14165cdb4fd77a5e9c8a1213486dcb8ca67.zip
SPC Codec: Simplify configuration and assume nothing need be disabled.
Most SoCs are these days are fast enough for realtime BRR, gaussian interpolation and echo processing. Change-Id: I180ce8ad45242c67b5e573a406b9522098a3f12b
Diffstat (limited to 'lib')
-rw-r--r--lib/rbcodec/codecs/libspc/spc_codec.h54
1 files changed, 21 insertions, 33 deletions
diff --git a/lib/rbcodec/codecs/libspc/spc_codec.h b/lib/rbcodec/codecs/libspc/spc_codec.h
index fad5a49916..96ca734f4c 100644
--- a/lib/rbcodec/codecs/libspc/spc_codec.h
+++ b/lib/rbcodec/codecs/libspc/spc_codec.h
@@ -41,53 +41,41 @@
#define ARM_ARCH 0
#endif
-#define SPC_DUAL_CORE 1
-
-#if !defined(SPC_DUAL_CORE) || NUM_CORES == 1
-#undef SPC_DUAL_CORE
+#if NUM_CORES == 1
#define SPC_DUAL_CORE 0
+#else
+#define SPC_DUAL_CORE 1
#endif
-/* Only some targets are fast enough for gaussian and realtime BRR decode */
-#if CONFIG_CPU == S3C2440 || CONFIG_CPU == IMX31L || \
- CONFIG_CPU == AS3525 || CONFIG_CPU == AS3525v2 || \
- defined(CPU_S5L870X) || \
- (CONFIG_PLATFORM & PLATFORM_HOSTED) || MEMORYSIZE <= 2
- /* Don't cache BRR waves */
- #define SPC_BRRCACHE 0
-
- /* Allow gaussian interpolation */
- #define SPC_NOINTERP 0
-
- /* Allow echo processing */
- #define SPC_NOECHO 0
-#elif defined(CPU_COLDFIRE)
+/* Only some targets are too slow for gaussian and realtime BRR decode */
+#if defined(CPU_COLDFIRE)
/* Cache BRR waves */
#define SPC_BRRCACHE 1
-
/* Disable gaussian interpolation */
#define SPC_NOINTERP 1
-
- /* Allow echo processing */
- #define SPC_NOECHO 0
-#elif defined (CPU_PP) && SPC_DUAL_CORE
+#elif defined (CPU_PP)
/* Cache BRR waves */
#define SPC_BRRCACHE 1
-
/* Disable gaussian interpolation */
#define SPC_NOINTERP 1
+#if !SPC_DUAL_CORE
+ /* Disable echo processing */
+ #define SPC_NOECHO 1
+#endif
+#endif /* CPU_* */
+/** Turn on, by default, all the good stuff **/
+#ifndef SPC_BRRCACHE
+ /* Don't cache BRR waves */
+ #define SPC_BRRCACHE 0
+#endif
+#ifndef SPC_NOINTERP
+ /* Allow gaussian interpolation */
+ #define SPC_NOINTERP 0
+#endif
+#ifndef SPC_NOECHO
/* Allow echo processing */
#define SPC_NOECHO 0
-#else
- /* Cache BRR waves */
- #define SPC_BRRCACHE 1
-
- /* Disable gaussian interpolation */
- #define SPC_NOINTERP 1
-
- /* Disable echo processing */
- #define SPC_NOECHO 1
#endif
#if (CONFIG_CPU == MCF5250)