Commit 173c88cc authored by Fabian Bauer's avatar Fabian Bauer
Browse files

put macro to options.h

parent 16d92614

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
#define NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS /* Nokia: fix basop issue 2233: Fix differing rtpdump streams */



#define NONBE_FIX_2237_ZERO_CURR_NOISE_PROBLEM              /* FhG: Modify sum of hTonalMDCTConc->curr_noise_nrg to avoid inaccurate zero */



#define BE_FIX_2240_COMPUTE_COV_MTC_FX_FAST                 /* FhG: SPeeds up covariance calculation e.g. 60 WMOPS for encoding -mc 7_1_4 24400 48 */

/* ################### End FIXES switches ########################### */



/* #################### Start BASOP porting switches ############################ */

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(