summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2009-08-16 11:32:41 +0000
committerJens Arnold <amiconn@rockbox.org>2009-08-16 11:32:41 +0000
commitaa24b677e0d014fcda65ec9c962d82316028056b (patch)
tree4c62b9d1e3171b08b3b8837d96943d77d74e094f
parent3b81dd47497b39952cbcf110acaa59b192fdda1c (diff)
downloadrockbox-aa24b677e0d014fcda65ec9c962d82316028056b.tar.gz
rockbox-aa24b677e0d014fcda65ec9c962d82316028056b.tar.bz2
rockbox-aa24b677e0d014fcda65ec9c962d82316028056b.zip
Revert r22339 as it causes immediate stack overflow on target, at least on coldfire.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22341 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/libatrac/atrac3.c9
-rw-r--r--apps/codecs/libatrac/atrac3.h1
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/codecs/libatrac/atrac3.c b/apps/codecs/libatrac/atrac3.c
index 8109a46276..47a63cae30 100644
--- a/apps/codecs/libatrac/atrac3.c
+++ b/apps/codecs/libatrac/atrac3.c
@@ -665,18 +665,17 @@ static int decodeChannelSoundUnit (GetBitContext *gb, channel_unit *pSnd, int32_
if (lastTonal >= 0)
numBands = FFMAX((lastTonal + 256) >> 8, numBands);
-
+
/* Reconstruct time domain samples. */
for (band=0; band<4; band++) {
- int32_t IMDCT_buf[1024];
/* Perform the IMDCT step without overlapping. */
if (band <= numBands) {
- IMLT(&(pSnd->spectrum[band*256]), IMDCT_buf, band&1);
+ IMLT(&(pSnd->spectrum[band*256]), pSnd->IMDCT_buf, band&1);
} else
- memset(IMDCT_buf, 0, 512 * sizeof(int32_t));
+ memset(pSnd->IMDCT_buf, 0, 512 * sizeof(int32_t));
/* gain compensation and overlapping */
- gainCompensateAndOverlap (IMDCT_buf, &(pSnd->prevFrame[band*256]), &(pOut[band*256]),
+ gainCompensateAndOverlap (pSnd->IMDCT_buf, &(pSnd->prevFrame[band*256]), &(pOut[band*256]),
&((pSnd->gainBlock[1 - (pSnd->gcBlkSwitch)]).gBlock[band]),
&((pSnd->gainBlock[pSnd->gcBlkSwitch]).gBlock[band]));
}
diff --git a/apps/codecs/libatrac/atrac3.h b/apps/codecs/libatrac/atrac3.h
index dbbafef34f..f81fc0a734 100644
--- a/apps/codecs/libatrac/atrac3.h
+++ b/apps/codecs/libatrac/atrac3.h
@@ -27,6 +27,7 @@ typedef struct {
gain_block gainBlock[2];
int32_t spectrum[1024] __attribute__((aligned(16)));
+ int32_t IMDCT_buf[1024] __attribute__((aligned(16)));
int32_t delayBuf1[46]; ///<qmf delay buffers
int32_t delayBuf2[46];