devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Enable wmapro compilation for lowmem targets by excluding multichannel buffers for them.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27593 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Mohamed Tarek 2010-07-28 14:01:10 +00:00
parent 341fae73ca
commit f2ed7ffaaa
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/codecs/SOURCES
View file

@ -32,10 +32,7 @@ au.c
vox.c vox.c
wav64.c wav64.c
tta.c tta.c
#if MEMORYSIZE > 2
wmapro.c wmapro.c
#endif
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING

6
apps/codecs/libwmapro/wmaprodec.c
View file

@ -156,7 +156,11 @@ static VLC coef_vlc[2]; ///< coefficient run length vlc codes
static int32_t g_tmp[WMAPRO_BLOCK_MAX_SIZE] IBSS_ATTR_WMAPRO_LARGE_IRAM; static int32_t g_tmp[WMAPRO_BLOCK_MAX_SIZE] IBSS_ATTR_WMAPRO_LARGE_IRAM;
static int32_t g_out_ch0[WMAPRO_OUT_BUF_SIZE] IBSS_ATTR; static int32_t g_out_ch0[WMAPRO_OUT_BUF_SIZE] IBSS_ATTR;
static int32_t g_out_ch1[WMAPRO_OUT_BUF_SIZE] IBSS_ATTR_WMAPRO_LARGE_IRAM; static int32_t g_out_ch1[WMAPRO_OUT_BUF_SIZE] IBSS_ATTR_WMAPRO_LARGE_IRAM;
#if MEMORYSIZE > 2
/* Enable multichannel for large-memory targets only */
static int32_t g_out_multichannel[WMAPRO_MAX_CHANNELS-2][WMAPRO_OUT_BUF_SIZE]; static int32_t g_out_multichannel[WMAPRO_MAX_CHANNELS-2][WMAPRO_OUT_BUF_SIZE];
# define MC_ENABLED
#endif
/** /**
* @brief frame specific decoder context for a single channel * @brief frame specific decoder context for a single channel
@ -301,8 +305,10 @@ int decode_init(asf_waveformatex_t *wfx)
/* Use globally defined arrays. Allows IRAM usage for up to 2 channels. */ /* Use globally defined arrays. Allows IRAM usage for up to 2 channels. */
s->channel[0].out = g_out_ch0; s->channel[0].out = g_out_ch0;
s->channel[1].out = g_out_ch1; s->channel[1].out = g_out_ch1;
#ifdef MC_ENABLED
for (i=2; i<WMAPRO_MAX_CHANNELS; ++i) for (i=2; i<WMAPRO_MAX_CHANNELS; ++i)
s->channel[i].out = g_out_multichannel[i-2]; s->channel[i].out = g_out_multichannel[i-2];
#endif
#if defined(CPU_COLDFIRE) #if defined(CPU_COLDFIRE)
coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE); coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE);