Commit e7b3fc0a authored by Vidhya V P's avatar Vidhya V P
Browse files

fb_mixer optimisation changes : set 3

parent e6a63766

lib_com/ivas_fb_mixer.c

+34 −41
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ ivas_error ivas_FB_mixer_open( 
    error = IVAS_ERR_OK;



    frame_len = (int16_t) ( sampling_rate / FRAMES_PER_SEC );



#ifdef SBA_BR_SWITCHING_CLEAN_UP

    hFbMixer = *hFbMixer_out;

    if ( !spar_reconfig_flag )
@@ -464,8 +465,7 @@ void ivas_FB_mixer_close( 
            }

#ifdef SBA_BR_SWITCHING_CLEAN_UP

        }

#endif

#ifdef SBA_BR_SWITCHING_CLEAN_UP



        if ( !spar_reconfig_flag )

        {

#endif
@@ -1079,7 +1079,10 @@ static ivas_error ivas_filterbank_setup( 
    set_s( hFbMixer->first_frame, 1, pCfg->num_out_chans );

    set_s( hFbMixer->first_frame + pCfg->num_out_chans, 0, IVAS_SPAR_MAX_CH - pCfg->num_out_chans );





#ifdef SBA_BR_SWITCHING_CLEAN_UP

    if ( !spar_reconfig_flag )

    {

#endif

        if ( pCfg->num_out_chans > 0 )

        {

            hFbMixer->pFb->filterbank_num_bands = ivas_get_num_bands( sampling_rate );
@@ -1101,10 +1104,7 @@ static ivas_error ivas_filterbank_setup( 
        hFbMixer->cross_fade_end_offset = pCfg->fade_len + pCfg->pcm_offset;

        hFbMixer->cross_fade_start_offset = hFbMixer->cross_fade_end_offset - pCfg->fade_len;

        hFbMixer->ana_window_offset = pCfg->fb_latency + pCfg->pcm_offset;

#ifdef SBA_BR_SWITCHING_CLEAN_UP

    if ( !spar_reconfig_flag )

    {

#endif



        if ( ( error = ivas_fb_mixer_get_window( pCfg->fb_latency, sampling_rate, &( hFbMixer->pAna_window ) ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -1114,9 +1114,6 @@ static ivas_error ivas_filterbank_setup( 
        {

            return error;

        }

#ifdef SBA_BR_SWITCHING_CLEAN_UP

    }

#endif

        if ( pCfg->num_out_chans > 0 )

        {

            ivas_filterbank_t *pFb = hFbMixer->pFb;
@@ -1126,10 +1123,7 @@ static ivas_error ivas_filterbank_setup( 
            pFb->fb_consts.pFilterbank_bins_start_offset = pAll_bins_start_offset;

            pFb->fb_bin_to_band.pFb_active_bins_per_band = pAll_bins_per_band_abs;

            pFb->fb_bin_to_band.pFb_start_bin_per_band = pAll_bins_start_offset_abs;

#ifdef SBA_BR_SWITCHING_CLEAN_UP

        if ( !spar_reconfig_flag )

        {

#endif



            /* Initialization for short stride Parameter calculation and SPAR CLDFB reconstruction */

            pFb->fb_bin_to_band.num_cldfb_bands = ( int16_t )( sampling_rate * INV_CLDFB_BANDWIDTH + 0.5f );

            /*pFb->fb_bin_to_band.cldfb_stride = ( int16_t )( ( sampling_rate / FRAMES_PER_SEC ) / CLDFB_NO_COL_MAX );*/ /* equals num_cldfb_bands*/
@@ -1211,11 +1205,10 @@ static ivas_error ivas_filterbank_setup( 


                ivas_calculate_abs_fr( pFb, sampling_rate, pCfg->active_w_mixing );

            }

        }

#ifdef SBA_BR_SWITCHING_CLEAN_UP

    }

#endif

    }



    return error;

}