From 2f109a7c2a38de0865ad31dced2574ecf00f5606 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Mon, 14 Oct 2024 13:42:25 -0400 Subject: [PATCH] flac: 7th channel decode buffer may not fit into IRAM. (Fixes failure to compile on nano2g) Change-Id: Ibe40a18ee74a3ac3ca2ec9dfac478d1fda5d34ee --- lib/rbcodec/codecs/flac.c | 2 +- lib/rbcodec/codecs/libffmpegFLAC/bitstream.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/rbcodec/codecs/flac.c b/lib/rbcodec/codecs/flac.c index c934e389c0..2c0b63ee16 100644 --- a/lib/rbcodec/codecs/flac.c +++ b/lib/rbcodec/codecs/flac.c @@ -33,7 +33,7 @@ static int32_t decoded2[MAX_BLOCKSIZE] IBSS_ATTR_FLAC_LARGE_IRAM; static int32_t decoded3[MAX_BLOCKSIZE] IBSS_ATTR_FLAC_LARGE_IRAM; static int32_t decoded4[MAX_BLOCKSIZE] IBSS_ATTR_FLAC_XLARGE_IRAM; static int32_t decoded5[MAX_BLOCKSIZE] IBSS_ATTR_FLAC_XLARGE_IRAM; -static int32_t decoded6[MAX_BLOCKSIZE] IBSS_ATTR_FLAC_XLARGE_IRAM; +static int32_t decoded6[MAX_BLOCKSIZE] IBSS_ATTR_FLAC_XXLARGE_IRAM; #define MAX_SUPPORTED_SEEKTABLE_SIZE 5000 diff --git a/lib/rbcodec/codecs/libffmpegFLAC/bitstream.h b/lib/rbcodec/codecs/libffmpegFLAC/bitstream.h index cd9589de40..159766e980 100644 --- a/lib/rbcodec/codecs/libffmpegFLAC/bitstream.h +++ b/lib/rbcodec/codecs/libffmpegFLAC/bitstream.h @@ -25,6 +25,7 @@ /* Enough IRAM to move additional data to it. */ #define IBSS_ATTR_FLAC_LARGE_IRAM IBSS_ATTR #define IBSS_ATTR_FLAC_XLARGE_IRAM +#define IBSS_ATTR_FLAC_XXLARGE_IRAM #elif (CONFIG_CPU == S5L8700) || (CONFIG_CPU == S5L8701) #define ICODE_ATTR_FLAC ICODE_ATTR @@ -32,6 +33,7 @@ /* Enough IRAM to move even more additional data to it. */ #define IBSS_ATTR_FLAC_LARGE_IRAM IBSS_ATTR #define IBSS_ATTR_FLAC_XLARGE_IRAM IBSS_ATTR +#define IBSS_ATTR_FLAC_XXLARGE_IRAM #else #define ICODE_ATTR_FLAC ICODE_ATTR @@ -39,6 +41,7 @@ /* Not enough IRAM available. */ #define IBSS_ATTR_FLAC_LARGE_IRAM #define IBSS_ATTR_FLAC_XLARGE_IRAM +#define IBSS_ATTR_FLAC_XXLARGE_IRAM #endif /* Endian conversion routines for standalone compilation */