Remove unneeded file from SOURCES and partial SVN sync.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15551 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 0 insertions, 111 deletions

diff --git a/apps/codecs/libspeex/modes.c b/apps/codecs/libspeex/modes.c
index 0478f97..cf4ef32 100644
--- a/apps/codecs/libspeex/modes.c
+++ b/apps/codecs/libspeex/modes.c
@@ -441,9 +441,6 @@ static const SpeexNBMode nb_mode = {
 #endif
    .012,   /*lag_factor*/
    QCONST16(.0002,15), /*lpc_floor*/
-#ifdef EPIC_48K
-   0,
-#endif
    {NULL, &nb_submode1, &nb_submode2, &nb_submode3, &nb_submode4, &nb_submode5, &nb_submode6, &nb_submode7,
    &nb_submode8, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
    5,
@@ -480,114 +477,6 @@ const SpeexMode speex_nb_mode = {
 };
 
 
-/* Wideband part */
-
-
-#ifdef EPIC_48K
-
-extern const signed char gain_cdbk_ulbr[];
-extern const signed char exc_12_32_table[];
-
-/* Parameters for Long-Term Prediction (LTP)*/
-static const ltp_params ltp_params_48k = {
-   gain_cdbk_ulbr,
-   3,
-   0
-};
-
-static const split_cb_params split_cb_nb_48k = {
-   12,               /*subvect_size*/
-   4,               /*nb_subvect*/
-   exc_12_32_table, /*shape_cb*/
-   5,               /*shape_bits*/
-   0,
-};
-
-
-/* 4.8 kbps very low bit-rate mode */
-static const SpeexSubmode nb_48k_submode = {
-   0,
-   0,
-   0,
-   0,
-#ifndef SPEEX_DISABLE_ENCODER
-   /*LSP quantization*/
-   lsp_quant_48k,
-   lsp_unquant_48k,
-   /*No pitch quantization*/
-   pitch_search_3tap,
-   pitch_unquant_3tap,
-   &ltp_params_48k,
-   /*Innovation quantization*/
-   split_cb_search_shape_sign,
-   split_cb_shape_sign_unquant,
-   &split_cb_nb_48k,
-#else
-   /*LSP quantization*/
-   NULL,
-   lsp_unquant_48k,
-   /*No pitch quantization*/
-   NULL,
-   pitch_unquant_3tap,
-   &ltp_params_48k,
-   /*Innovation quantization*/
-   NULL,
-   split_cb_shape_sign_unquant,
-   &split_cb_nb_48k,
-#endif
-   QCONST16(.7,15),
-   144
-};
-
-
-/* Special, non-standard 4.8 kbps mode */
-static const SpeexNBMode nb_48k_mode = {
-   240,    /*frameSize*/
-   48,     /*subframeSize*/
-   10,     /*lpcSize*/
-   17,     /*pitchStart*/
-   144,    /*pitchEnd*/
-   0.9,    /*gamma1*/
-   0.6,    /*gamma2*/
-   .01,   /*lag_factor*/
-   QCONST16(.0003,15), /*lpc_floor*/
-   1,
-   {NULL, NULL, &nb_48k_submode, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
-   2,
-   {2,2,2,2,2,2,2,2,2,2,2}
-};
-
-
-/* Default mode for narrowband */
-const SpeexMode speex_nb_48k_mode = {
-   &nb_48k_mode,
-   nb_mode_query,
-   "narrowband 4.8 kbps",
-   1000,
-   4,
-#ifndef SPEEX_DISABLE_ENCODER
-   &nb_encoder_init,
-   &nb_encoder_destroy,
-   &nb_encode,
-   &nb_decoder_init,
-   &nb_decoder_destroy,
-   &nb_decode,
-   &nb_encoder_ctl,
-   &nb_decoder_ctl,
-#else
-   NULL,
-   NULL,
-   NULL,
-   &nb_decoder_init,
-   &nb_decoder_destroy,
-   &nb_decode,
-   NULL,
-   &nb_decoder_ctl,
-#endif
-};
-
-
-#endif
 
 int speex_mode_query(const SpeexMode *mode, int request, void *ptr)
 {