Commit 5625bf03 authored by vaclav's avatar vaclav
Browse files

fix WMC build with unremoved defines

parent b6452eb9

lib_dec/ivas_spar_foa_dec.c

+7 −5
Original line number Diff line number Diff line
@@ -590,11 +590,13 @@ void ivas_spar_dec_MD( 
    DECODER_CONFIG_HANDLE hDecoderConfig = st_ivas->hDecoderConfig;

#ifndef FIX_SBA_CLEAN_UP_OPT

    ivas_spar_foa_dec_state_t *pState = st_ivas->hSpar->hSparFoa;



    wmops_sub_start( "ivas_spar_foa_dec_MD" );

#else

    SPAR_DEC_HANDLE pState = st_ivas->hSpar;

#endif



#ifndef FIX_SBA_CLEAN_UP_OPT

    wmops_sub_start( "ivas_spar_foa_dec_MD" );

#else

    wmops_sub_start( "ivas_spar_dec_MD" );

#endif
@@ -814,7 +816,7 @@ void ivas_spar_get_parameters( 
    float par_mat[IVAS_SPAR_MAX_CH][IVAS_SPAR_MAX_CH][IVAS_MAX_NUM_BANDS] )

#endif

{

    int16_t spar_band, out_ch, in_ch;

    int16_t spar_band, out_ch, in_ch, prev_idx;

    float weight, weight_20ms;

    int16_t ts0, ts1, split_band;
@@ -869,11 +871,11 @@ void ivas_spar_get_parameters( 
                {

#ifndef FIX_SBA_CLEAN_UP_OPT

                    /* 20ms Transport channel reconstruction with matching encoder/decoder processing */

                    int16_t prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */

                    prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */

                    par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight_20ms ) * hSparFoa->hMdDec->mixer_mat_prev[prev_idx][out_ch][in_ch][spar_band] + weight_20ms * hSparFoa->hMdDec->mixer_mat[out_ch][in_ch][spar_band];

#else

                    /* 20ms Transport channel reconstruction with matching encoder/decoder processing */

                    int16_t prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */

                    prev_idx = SPAR_DIRAC_SPLIT_START_BAND < IVAS_MAX_NUM_BANDS ? 1 : 0; /* if SPAR_DIRAC_SPLIT_START_BAND == IVAS_MAX_NUM_BANDS, then the sub-frame mixer_mat delay line is not active */

                    par_mat[out_ch][in_ch][spar_band] = ( 1.0f - weight_20ms ) * hSpar->hMdDec->mixer_mat_prev[prev_idx][out_ch][in_ch][spar_band] + weight_20ms * hSpar->hMdDec->mixer_mat[out_ch][in_ch][spar_band];

#endif

                }