Commit 454268e4 authored by multrus's avatar multrus
Browse files

[cleanup] accept ERI_FDCNGVQ_LOW_ROM

parent 1c8f560d

lib_com/cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -1389,7 +1389,6 @@ enum 
#define NPARTCLDFB                          10

#define NPART_SHAPING                       62



#ifdef ERI_FDCNGVQ_LOW_ROM

#define FDCNG_VQ_MAX_LEN        FD_CNG_maxN_37bits   

#define FDCNG_VQ_DCT_NSEGM      4   

#define FDCNG_VQ_DCT_MINTRUNC   8
@@ -1406,7 +1405,6 @@ typedef enum _DCTTYPE 
    IDCT_T2_XX_21 = 3

} DCTTYPE;



#endif 



#define MSSUBFRLEN                          12

#define MSNUMSUBFR                          6

lib_com/lsf_tools.c

+0 −22
Original line number Diff line number Diff line
@@ -2027,7 +2027,6 @@ int16_t tcxlpc_get_cdk( 
    return cdk;

}



#ifdef ERI_FDCNGVQ_LOW_ROM

void dec_FDCNG_MSVQ_stage1(

    int16_t j_full,            /* i:   index full range           */

    int16_t n,                 /* i:   dimension to generate      */
@@ -2082,7 +2081,6 @@ void dec_FDCNG_MSVQ_stage1( 
    v_add( idct_vec, cdk1r_tr_midQ_truncQ, uq, n );

    assert( uq_ind == NULL );

}

#endif





/*--------------------------------------------------------------------------*
@@ -2100,10 +2098,8 @@ void msvq_dec( 
    const int16_t N,        /* i  : Vector dimension                                     */

    const int16_t maxN,     /* i  : Codebook dimension                                   */

    const int16_t Idx[],    /* i  : Indices                                              */

#ifdef ERI_FDCNGVQ_LOW_ROM

    const int16_t applyIDCT_flag, /* i  : applyIDCT flag                                 */

    const float *invTrfMatrix,    /* i:   matrix for IDCT synthesis                      */

#endif

    float *uq,     /* o  : quantized vector                                           */

    Word16 *uq_ind /* o  : quantized vector (fixed point)                             */

)
@@ -2141,7 +2137,6 @@ void msvq_dec( 
            start = 0;

        }



#ifdef ERI_FDCNGVQ_LOW_ROM

        if ( i == 0 && applyIDCT_flag != 0 )

        {

            assert( start == 0 );
@@ -2162,21 +2157,6 @@ void msvq_dec( 
            }

        }

#undef WMC_TOOL_SKIP

#else



        v_add( uq + start, cb[i] + Idx[i] * maxn, uq + start, n );



#define WMC_TOOL_SKIP

        IF( uq_ind != NULL )

        {

            FOR( j = 0; j < n; ++j )

            {

                move16();

                uq_ind[start + j] = add( uq_ind[start + j], (Word16) ( cb[i][Idx[i] * maxn + j] * 2.0f * 1.28f ) );

            }

        }

#undef WMC_TOOL_SKIP

#endif

    }



    return;
@@ -2445,7 +2425,6 @@ void a2isf( 
    return;

}



#ifdef ERI_FDCNGVQ_LOW_ROM

/*-------------------------------------------------------------------*

 * dctT2_N_apply_matrix()

 *
@@ -2637,4 +2616,3 @@ void create_IDCT_N_Matrix( float *inv_matrixFloatQ, const int16_t N, const int16 
}



#endif

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 
#define FIX_419_ISM_BRATE_SW_DTX                        /* VA: issue 419: fix ISM Bitrate Switching with dtx */

#define FIX_422                                         /* FhG: Issue 422: re-introduce fix for noisy speech buffer in ParamISM */



#define ERI_FDCNGVQ_LOW_ROM                             /* Eri: Contribution #31 Table ROM saving for IVAS FDCNG-VQ modes       */



#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

+0 −6
Original line number Diff line number Diff line
@@ -8057,10 +8057,8 @@ void msvq_enc( 
    const float w[],      /* i  : Weights                                              */

    const int16_t N,      /* i  : Vector dimension                                     */

    const int16_t maxN,   /* i  : Codebook dimension                                   */

#ifdef ERI_FDCNGVQ_LOW_ROM

    const int16_t applyDCT_flag, /* i  : applyDCT flag                                   */

    float *invTrfMatrix,         /* i:/o   expanded synthesis matrix                        */

#endif

    int16_t Idx[] /* o  : Indices                                              */

);
@@ -8072,15 +8070,12 @@ void msvq_dec( 
    const int16_t N,        /* i  : Vector dimension                                     */

    const int16_t maxN,     /* i  : Codebook dimension                                   */

    const int16_t Idx[],    /* i  : Indices                                              */

#ifdef ERI_FDCNGVQ_LOW_ROM

    const int16_t applyIDCT_flag, /* i  : applyIDCT flag                                 */

    const float *invTrfMatrix,    /* i: synthesis matrix                                 */

#endif

    float *uq,     /* o  : quantized vector                                     */

    Word16 *uq_ind /* o  : quantized vector (fixed point)                       */

);



#ifdef ERI_FDCNGVQ_LOW_ROM

void dec_FDCNG_MSVQ_stage1(

    int16_t j_full,            /* i:   index full range           */

    int16_t n,                 /* i:   dimension to generate      */
@@ -8116,7 +8111,6 @@ void extend_dctN_input( 
    float *matrix,          /* i: idct matrix of  size  N rows ,  n_cols  columns*/

    const int16_t n_cols,   /* i: number of columns ==  truncation length */

    DCTTYPE dcttype );      /* i: matrix  type    */

#endif



void PulseResynchronization(

    const float *src_exc,       /* i  : Input excitation buffer                 */

lib_com/rom_com.c

+0 −139

File changed.

Preview size limit exceeded, changes collapsed.