summaryrefslogtreecommitdiff
path: root/apps/codecs/libFLAC/stream_decoder.c
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2005-03-03 12:17:45 +0000
committerThom Johansen <thomj@rockbox.org>2005-03-03 12:17:45 +0000
commit340d8245429db340d4e0dafb8633c4ac2bab2061 (patch)
tree8a623d45c57609513039a0ce2e004da71ea8ffba /apps/codecs/libFLAC/stream_decoder.c
parentd061b371d6f53e0c2f310f4eb5776430772a8ac5 (diff)
downloadrockbox-340d8245429db340d4e0dafb8633c4ac2bab2061.zip
rockbox-340d8245429db340d4e0dafb8633c4ac2bab2061.tar.gz
rockbox-340d8245429db340d4e0dafb8633c4ac2bab2061.tar.bz2
rockbox-340d8245429db340d4e0dafb8633c4ac2bab2061.tar.xz
Added new coldfire assembly LPC decoder routine to libFLAC.
Added clear accumulator policy. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6108 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libFLAC/stream_decoder.c')
-rw-r--r--apps/codecs/libFLAC/stream_decoder.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/apps/codecs/libFLAC/stream_decoder.c b/apps/codecs/libFLAC/stream_decoder.c
index cbf57a1..7efe57b 100644
--- a/apps/codecs/libFLAC/stream_decoder.c
+++ b/apps/codecs/libFLAC/stream_decoder.c
@@ -299,14 +299,17 @@ FLAC_API FLAC__StreamDecoderState FLAC__stream_decoder_init(FLAC__StreamDecoder
*/
FLAC__cpu_info(&decoder->private_->cpuinfo);
/* first default to the non-asm routines */
- decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal;
decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide;
- decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal;
-#if CONFIG_CPU==MCF5249 && !SIMULATOR
- decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_order8_mac;
+#if CONFIG_CPU==MCF5249 && !defined(SIMULATOR)
+ decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal_mcf5249;
+ decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_mcf5249;
+ decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_mcf5249;
#else
- decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal;
+ decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal;
+ decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal;
+ decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal;
#endif
+ decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide;
/* now override with asm where appropriate */
#ifndef FLAC__NO_ASM
if(decoder->private_->cpuinfo.use_asm) {