summaryrefslogtreecommitdiffstats
path: root/apps/codecs/libfaad/decoder.c
diff options
context:
space:
mode:
authorMichael Giacomelli <giac2000@hotmail.com>2008-09-04 18:02:10 +0000
committerMichael Giacomelli <giac2000@hotmail.com>2008-09-04 18:02:10 +0000
commit46f85c4c547188d08fd90bad7734d38c654f13ea (patch)
treef868536dccac3a8d4047d11f29310e99b896b03b /apps/codecs/libfaad/decoder.c
parent6c608263d7e19ea9189e6812eed8fc29996b4ef2 (diff)
downloadrockbox-46f85c4c547188d08fd90bad7734d38c654f13ea.tar.gz
rockbox-46f85c4c547188d08fd90bad7734d38c654f13ea.tar.bz2
rockbox-46f85c4c547188d08fd90bad7734d38c654f13ea.zip
Combine the Vorbis, WMA and AAC IMDCT functions and put them into the codeclib. Combined IMDCT is now based on existing Tremor transform. Reduces CPU for 192k AAC by 21MHz on Coldfire, and 5MHz on PP5024. WMA and Vorbis should have no functional changes since they already used this code. Further optimization is possible and would benefit all 3 codecs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18412 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libfaad/decoder.c')
-rw-r--r--apps/codecs/libfaad/decoder.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/codecs/libfaad/decoder.c b/apps/codecs/libfaad/decoder.c
index 2285168253..db51d2ab6d 100644
--- a/apps/codecs/libfaad/decoder.c
+++ b/apps/codecs/libfaad/decoder.c
@@ -289,7 +289,7 @@ int32_t NEAACDECAPI NeAACDecInit(NeAACDecHandle hDecoder, uint8_t *buffer,
hDecoder->fb = ssr_filter_bank_init(hDecoder->frameLength/SSR_BANDS);
else
#endif
- hDecoder->fb = filter_bank_init(hDecoder->frameLength);
+
#ifdef LD_DEC
if (hDecoder->object_type == LD)
@@ -383,7 +383,6 @@ int8_t NEAACDECAPI NeAACDecInit2(NeAACDecHandle hDecoder, uint8_t *pBuffer,
hDecoder->fb = ssr_filter_bank_init(hDecoder->frameLength/SSR_BANDS);
else
#endif
- hDecoder->fb = filter_bank_init(hDecoder->frameLength);
#ifdef LD_DEC
if (hDecoder->object_type == LD)
@@ -429,7 +428,6 @@ int8_t NEAACDECAPI NeAACDecInitDRM(NeAACDecHandle *hDecoder, uint32_t samplerate
(*hDecoder)->sbr_present_flag = 1;
#endif
- (*hDecoder)->fb = filter_bank_init((*hDecoder)->frameLength);
return 0;
}
@@ -471,7 +469,7 @@ void NEAACDECAPI NeAACDecClose(NeAACDecHandle hDecoder)
ssr_filter_bank_end(hDecoder->fb);
else
#endif
- filter_bank_end(hDecoder->fb);
+
drc_end(hDecoder->drc);