1 files changed, 20 insertions, 1 deletions

diff --git a/apps/codecs/libmusepack/mpcdec.h b/apps/codecs/libmusepack/mpcdec.h
index d4c3bd22fc..68754dcbd2 100644
--- a/apps/codecs/libmusepack/mpcdec.h
+++ b/apps/codecs/libmusepack/mpcdec.h
@@ -52,23 +52,42 @@ extern "C" {
 #define IBSS_ATTR_MPC_LARGE_IRAM   IBSS_ATTR
 #define ICODE_ATTR_MPC_LARGE_IRAM
 #define ICONST_ATTR_MPC_LARGE_IRAM ICONST_ATTR
+/* Does not fit into IRAM. */
+#define IBSS_ATTR_MPC_BITBUFFER
+#define ICODE_ATTR_MPC_SV8_BS_DEC
 /* Keep the data arrays of bitsreadr.c in IRAM. */
 #define ICONST_ATTR_MPC_BITSREADER ICONST_ATTR
 
-#elif (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024) || defined(CPU_S5L870X)
+#elif (CONFIG_CPU == PP5022) || (CONFIG_CPU == PP5024)
 /* Enough IRAM to move additional data and code to it. */
 #define IBSS_ATTR_MPC_LARGE_IRAM   IBSS_ATTR
 #define ICODE_ATTR_MPC_LARGE_IRAM  ICODE_ATTR
 #define ICONST_ATTR_MPC_LARGE_IRAM ICONST_ATTR
+/* Does not fit into IRAM. */
+#define IBSS_ATTR_MPC_BITBUFFER
+#define ICODE_ATTR_MPC_SV8_BS_DEC
 /* Not putting the data arrays of bitsreader.c to IRAM allows to move the
  * sv7/sv8 bitstream demuxing into IRAM. This config is faster. */
 #define ICONST_ATTR_MPC_BITSREADER
 
+#elif defined(CPU_S5L870X)
+/* Enough IRAM to move additional data and code to it. */
+#define IBSS_ATTR_MPC_LARGE_IRAM   IBSS_ATTR
+#define ICODE_ATTR_MPC_LARGE_IRAM  ICODE_ATTR
+#define ICONST_ATTR_MPC_LARGE_IRAM ICONST_ATTR
+/* Faster when moved to IRAM. */
+#define IBSS_ATTR_MPC_BITBUFFER    IBSS_ATTR
+#define ICODE_ATTR_MPC_SV8_BS_DEC  ICODE_ATTR
+/* Not faster when moved to IRAM. */
+#define ICONST_ATTR_MPC_BITSREADER
+
 #else
 /* Not enough IRAM available. */
 #define IBSS_ATTR_MPC_LARGE_IRAM
 #define ICODE_ATTR_MPC_LARGE_IRAM
 #define ICONST_ATTR_MPC_LARGE_IRAM
+#define IBSS_ATTR_MPC_BITBUFFER
+#define ICODE_ATTR_MPC_SV8_BS_DEC
 #define ICONST_ATTR_MPC_BITSREADER
 #endif