Commit 8febb91c authored by Fabian Bauer's avatar Fabian Bauer Committed by Manuel Jander
Browse files

put macro to options.h

parent 5f98d346

lib_dec/fd_cng_dec_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -133,19 +133,9 @@ void initFdCngDec_ivas_fx( 


    set16_fx( hFdCngDec->msPsd, 0, NPART_SHAPING );

    set32_fx( hFdCngDec->msPsd_fx, 0, NPART_SHAPING );

<<<<<<< HEAD

<<<<<<< HEAD

#ifdef FIX_2245_INIT_FD_CNG_EVS

    set16_fx( hFdCngDec->msNoiseFloor, 0, NPART_SHAPING );

#endif

=======

    set16_fx( hFdCngDec->msNoiseFloor, 0, NPART_SHAPING );

>>>>>>> 5c78c00f1 (commit the actual fix)

=======

#ifdef FIX_2245_INIT_FD_CNG_EVS

    set16_fx( hFdCngDec->msNoiseFloor, 0, NPART_SHAPING );

#endif

>>>>>>> fbf0056f4 (add compilation switch)

    set32_fx( hFdCngDec->msNoiseFloor_32fx, 0, NPART_SHAPING );



    set32_fx( hFdCngDec->msNoiseEst, 0, NPART_SHAPING );

lib_enc/ivas_mcmasa_enc_fx.c

+4 −5
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include "ivas_rom_enc.h"

#include "wmc_auto.h"

#include "ivas_prot_fx.h"

#define compute_cov_mtx_fx_ADDCOV



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

 * Local constants
@@ -72,7 +71,7 @@ static void ivas_mcmasa_dmx_fx( 
    const Word16 nchan_transport,

    const Word16 nchan_inp );



#ifdef compute_cov_mtx_fx_ADDCOV

#ifdef BE_FIX_2240_COMPUTE_COV_MTC_FX_FAST

/* Compute covariance matrix, i.e., xT * conj(x), and accumulate to the output */

static void compute_cov_mtx_fx(

    Word32 sr[MCMASA_MAX_ANA_CHANS][DIRAC_NO_FB_BANDS_MAX], /* i  : Input matrix, real, s[ch][freq]               (inp_exp) */
@@ -931,7 +930,7 @@ void ivas_mcmasa_param_est_enc_fx( 
    Word32 renormalization_factor_diff_fx[MASA_FREQUENCY_BANDS]; // renormalization_factor_diff_e

    Word16 renormalization_factor_diff_e[MASA_FREQUENCY_BANDS];

    Word32 norm_tmp_fx;

#ifdef compute_cov_mtx_fx_ADDCOV

#ifdef BE_FIX_2240_COMPUTE_COV_MTC_FX_FAST

    Word16 mrange[2];

#else

    Word16 mrange[2], brange[2];
@@ -1080,7 +1079,7 @@ void ivas_mcmasa_param_est_enc_fx( 
            }

            inp_q = add( inp_q, sf );



#ifdef compute_cov_mtx_fx_ADDCOV

#ifdef BE_FIX_2240_COMPUTE_COV_MTC_FX_FAST

            /* Compute covariance matrix */

            compute_cov_mtx_fx( Chnl_RealBuffer_fx, Chnl_ImagBuffer_fx, num_freq_bands, numAnalysisChannels, COVls, sub( 31, inp_q ), hMcMasa->band_grouping );
@@ -2120,7 +2119,7 @@ static void ivas_mcmasa_dmx_fx( 
    return;

}



#ifdef compute_cov_mtx_fx_ADDCOV

#ifdef BE_FIX_2240_COMPUTE_COV_MTC_FX_FAST



/* Compute covariance matrix, i.e., xT * conj(x), and accumulate to the output */

static void compute_cov_mtx_fx(