Commit 10b9396f authored by Jonas Svedberg's avatar Jonas Svedberg
Browse files

renamed define to fix#443_*

parent a42346b5

lib_com/cnst.h

+2 −2
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ enum 
#define FDCNG_VQ_DCT_MAXTRUNC   18  

#define FDCNG_VQ_MAX_LEN_WB     21 



#ifdef ERI_MSVQ_CLEANUP_WB1  

#ifdef FIX_443_ERI_MSVQ_CLEANUP_WB1  

#define FDCNG_VQ_MAX_LEN_WB1     20 

#endif
@@ -1407,7 +1407,7 @@ typedef enum _DCTTYPE 
    IDCT_T2_XX_24 = 1,

    DCT_T2_21_XX = 2, /* truncated DCT_T2_21 */

    IDCT_T2_XX_21 = 3    

#ifdef ERI_MSVQ_CLEANUP_WB1

#ifdef FIX_443_ERI_MSVQ_CLEANUP_WB1

    ,DCT_T2_20_XX = 4, /* truncated DCT_T2_20 */

    IDCT_T2_XX_20 = 5    

#endif

lib_com/lsf_tools.c

+2 −2
Original line number Diff line number Diff line
@@ -2460,7 +2460,7 @@ void dctT2_N_apply_matrix( 
        mat_step_col = matrix_row_dim; /* matrix maximum storage size dependent,  width of first row in matrix  */

        mat_step_row = 0;

        mat_step_col_flag = 1;

#ifdef ERI_MSVQ_CLEANUP_WB1

#ifdef FIX_443_ERI_MSVQ_CLEANUP_WB1

        assert( dcttype == DCT_T2_20_XX || dcttype == DCT_T2_21_XX || dcttype == DCT_T2_24_XX );

#else 

        assert( dcttype == DCT_T2_21_XX || dcttype == DCT_T2_24_XX );
@@ -2573,7 +2573,7 @@ void create_IDCT_N_Matrix( float *inv_matrixFloatQ, const int16_t N, const int16 
        idx_ptr    = idctT2_21_compressed_idx;

        len = N;

    }

#ifdef ERI_MSVQ_CLEANUP_WB1

#ifdef FIX_443_ERI_MSVQ_CLEANUP_WB1

    if ( N == FDCNG_VQ_MAX_LEN_WB1 )

    {

        absval_ptr = unique_idctT2_20coeffsQ16;

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 




#define ERI_MSVQ_CLEANUP                                /* Eri: Contribution #31  BE modularization of msvq encoder side DCT21&DCT24 within msvq_enc()        */

#define ERI_MSVQ_CLEANUP_WB1                             /*Eri: Contribution #31   non-BE for  ISM   low rate (total_rate < 8kbps)   using WB1 bandwidth        */

#define FIX_443_ERI_MSVQ_CLEANUP_WB1                             /*Eri: Contribution 31 ticket #443, added support for fdcng WB1 bandwidth(N==20)  used in dyx cond ISM2 at 16.4 kbps  (total_rate==4450  <= 8kbps)        */



#define FIX_416_ISM_BR_SWITCHING                        /* FhG: add missing CLDFB reconfig to ISM BR switching */

#define FIX_SP2A                                        /* VA: Issue 412: Adjust threshold for the S_p2a feature in the tonal detector */

lib_com/prot.h

+1 −1
Original line number Diff line number Diff line
@@ -8142,7 +8142,7 @@ int16_t msvq_stage1_dct_search( /* o 


int16_t msvq_stage1_dct_recalc_candidates_fdcng_wb(

    /* o  : (updated p_max)                */

#ifdef ERI_MSVQ_CLEANUP_WB1

#ifdef FIX_443_ERI_MSVQ_CLEANUP_WB1

    const int16_t n,              /*i   : original target length            */

#endif 

    const float *st1_syn_vec_ptr, /* i  : IDCT24 synthesis vectors       */

lib_com/rom_com.c

+1 −1
Original line number Diff line number Diff line
@@ -6140,7 +6140,7 @@ const Word8 idctT2_21_compressed_idx[(FDCNG_VQ_DCT_MAXTRUNC *( (21/2) + 1)) /* 
};

 /*low storage IDCT24x18 table &&  IDCT21*18 */













#ifdef ERI_MSVQ_CLEANUP_WB1













#ifdef FIX_443_ERI_MSVQ_CLEANUP_WB1















const Word16  unique_idctT2_20coeffsQ16[21] = {  















     0,   1626,   3242,   4838,   6404,   7931,   9409,  10828,















 12181,  13459,  14654,  15759,  16766,  17670,  18465,  19147,