Commit 09eb95e4 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_331_ALL_BRS

parent 48e2c068

lib_com/ivas_cov_smooth.c

+0 −35
Original line number Diff line number Diff line
@@ -51,10 +51,6 @@ static void ivas_set_up_cov_smoothing( 
    ivas_filterbank_t *pFb,

    const float max_update_rate,

    const int16_t min_pool_size

#ifndef FIX_331_ALL_BRS

    ,

    const int16_t nchan_inp /* i  : number of input channels       */

#endif

    ,

    const int32_t ivas_total_brate )

{
@@ -94,30 +90,6 @@ static void ivas_set_up_cov_smoothing( 
        }

    }

    else

#ifndef FIX_331_ALL_BRS

        if ( nchan_inp <= FOA_CHANNELS )

    {

        for ( j = 0; j < pFb->filterbank_num_bands; j++ )

        {

            float update_factor;

            update_factor = 0.0f;



            for ( k = 0; k < pFb->fb_bin_to_band.pFb_active_bins_per_band[j]; k++ )

            {

                update_factor += pFb->fb_bin_to_band.pFb_bin_to_band[j][k];

            }



            hCovState->pSmoothing_factor[j] = update_factor / min_pool_size;



            if ( hCovState->pSmoothing_factor[j] > max_update_rate )

            {

                hCovState->pSmoothing_factor[j] = max_update_rate;

            }

        }

    }

    else

    {

#endif

        for ( j = 0; j < pFb->filterbank_num_bands; j++ )

        {

            float update_factor;
@@ -137,9 +109,6 @@ static void ivas_set_up_cov_smoothing( 
                hCovState->pSmoothing_factor[j] = max_update_rate;

            }

        }

#ifndef FIX_331_ALL_BRS

    }

#endif

    hCovState->prior_bank_idx = -1;



    return;
@@ -187,11 +156,7 @@ ivas_error ivas_spar_covar_smooth_enc_open( 
    }





#ifndef FIX_331_ALL_BRS

    ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, nchan_inp, ivas_total_brate );

#else

    ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, ivas_total_brate );

#endif



    *hCovState_out = hCovState;

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ 


#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FIX_331_ALL_BRS                                 /*Enable the fix_331 across all the bitrates and sba modes*/

#define FIX_ISM_DTX_CNG_BWIDTH_ALT                      /* VA: issue 396 - alternative fix for bw changes on CNG frames in ISM DTX for objects that use the decoder-side noise estimation */



#define FIX_398_MASA_DIRECTION_ALIGNMENT                /* Nokia: Issue 398: in 2dir MASA, dynamically adjust directions to be consistent */

lib_enc/ivas_spar_encoder.c

+0 −6
Original line number Diff line number Diff line
@@ -503,12 +503,6 @@ static ivas_error ivas_spar_enc_process( 
     *-----------------------------------------------------------------------------------------*/



    ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame, transient_det );

#ifndef FIX_331_ALL_BRS

    if ( sba_order == 1 )

    {

        transient_det[1] = transient_det[0];

    }

#endif

    if ( ivas_total_brate < IVAS_24k4 )

    {

        transient_det[1] = 0;