diff options
author | Thom Johansen <thomj@rockbox.org> | 2007-11-01 21:30:51 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2007-11-01 21:30:51 +0000 |
commit | bf1b7f131c933b83afe62f01c200366e4e2e37f3 (patch) | |
tree | a9ab90e6a01df357b7a8649d8e626a47e1678f64 /apps/codecs/libspeex/ltp.c | |
parent | 6d88717f6949587908ec08affa07d06239c3bae1 (diff) | |
download | rockbox-bf1b7f131c933b83afe62f01c200366e4e2e37f3.tar.gz rockbox-bf1b7f131c933b83afe62f01c200366e4e2e37f3.zip |
First attempt at ifdeffing out as much of the encoder stuff as possible from Speex. Gives a smaller binary and allows me to remove a couple more files from SOURCES.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15394 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libspeex/ltp.c')
-rw-r--r-- | apps/codecs/libspeex/ltp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/codecs/libspeex/ltp.c b/apps/codecs/libspeex/ltp.c index 6af02e2582..720baaad02 100644 --- a/apps/codecs/libspeex/ltp.c +++ b/apps/codecs/libspeex/ltp.c | |||
@@ -75,6 +75,7 @@ spx_word32_t inner_prod(const spx_word16_t *x, const spx_word16_t *y, int len) | |||
75 | } | 75 | } |
76 | #endif | 76 | #endif |
77 | 77 | ||
78 | #ifndef SPEEX_DISABLE_ENCODER | ||
78 | #ifndef OVERRIDE_PITCH_XCORR | 79 | #ifndef OVERRIDE_PITCH_XCORR |
79 | #if 0 /* HINT: Enable this for machines with enough registers (i.e. not x86) */ | 80 | #if 0 /* HINT: Enable this for machines with enough registers (i.e. not x86) */ |
80 | void pitch_xcorr(const spx_word16_t *_x, const spx_word16_t *_y, spx_word32_t *corr, int len, int nb_pitch, char *stack) | 81 | void pitch_xcorr(const spx_word16_t *_x, const spx_word16_t *_y, spx_word32_t *corr, int len, int nb_pitch, char *stack) |
@@ -659,6 +660,7 @@ spx_word32_t *cumul_gain | |||
659 | #endif | 660 | #endif |
660 | return pitch; | 661 | return pitch; |
661 | } | 662 | } |
663 | #endif | ||
662 | 664 | ||
663 | void pitch_unquant_3tap( | 665 | void pitch_unquant_3tap( |
664 | spx_word16_t exc[], /* Input excitation */ | 666 | spx_word16_t exc[], /* Input excitation */ |
@@ -760,6 +762,7 @@ int cdbk_offset | |||
760 | } | 762 | } |
761 | 763 | ||
762 | 764 | ||
765 | #ifndef SPEEX_DISABLE_ENCODER | ||
763 | /** Forced pitch delay and gain */ | 766 | /** Forced pitch delay and gain */ |
764 | int forced_pitch_quant( | 767 | int forced_pitch_quant( |
765 | spx_word16_t target[], /* Target vector */ | 768 | spx_word16_t target[], /* Target vector */ |
@@ -809,6 +812,7 @@ spx_word32_t *cumul_gain | |||
809 | target[i]=EXTRACT16(SATURATE(SUB32(EXTEND32(target[i]),EXTEND32(res[i])),32700)); | 812 | target[i]=EXTRACT16(SATURATE(SUB32(EXTEND32(target[i]),EXTEND32(res[i])),32700)); |
810 | return start; | 813 | return start; |
811 | } | 814 | } |
815 | #endif | ||
812 | 816 | ||
813 | /** Unquantize forced pitch delay and gain */ | 817 | /** Unquantize forced pitch delay and gain */ |
814 | void forced_pitch_unquant( | 818 | void forced_pitch_unquant( |