Commit 55a18714 authored by Jonas Svedberg's avatar Jonas Svedberg
Browse files

ifdef corrections

parent bb193fee

lib_enc/fd_cng_enc.c

+1 −0
Original line number Diff line number Diff line
@@ -1260,6 +1260,7 @@ void FdCngEncodeDiracMDCTStereoSID( 
    }



    /* M/S transform on log envelopes */

#ifdef ERI_FDCNGVQ_LOW_ROM

    convertToMS( NPART, ms_ptr[0], ms_ptr[1], 0.5f ); /* TBD Note:   NPART should likely be N[0] if N[0] may change */



    E[0] = sum_f( ms_ptr[0], NPART ); /* TBD Note:   NPART should likely be N[0] if N[0] may change */

lib_enc/lsf_msvq_ma_enc.c

+71 −71
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include "ivas_prot.h"

void dctT2_N_apply_matrix( const float *input, float *output, const int16_t dct_dim, int16_t fdcngvq_dim, const float *idctT2_24_X_matrixQ16, const int16_t matrix_1st_dim, DCTTYPE dcttype );



#ifdef ERI_FDCNGVQ_LOW_ROM

#ifdef ERI_MSVQ_CLEANUP



int16_t msvq_stage1_dct_search(                  /* o  : (p_max , best candidate sofar )                                  */
@@ -379,9 +380,9 @@ void msvq_enc( 


#ifndef ERI_MSVQ_CLEANUP

    dcttype = DCT_T2_24_XX;



#endif



#endif 

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

     *   Allocate memory for previous (parent) and current nodes.

     *   Parent node is indexed [0], current node is indexed [1].
@@ -465,7 +466,6 @@ void msvq_enc( 
        }



#ifdef ERI_FDCNGVQ_LOW_ROM



#ifdef ERI_MSVQ_CLEANUP

        if ( !s && applyDCT_flag != 0 ) /* means: m==1 */

        {