Commit 87f5e8bf authored by vaillancour's avatar vaillancour
Browse files

replacing flaf_swb_tbe by flag_swb_tbe

parent 017ec540

lib_dec/ivas_core_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ ivas_error ivas_core_dec( 
    int16_t tmps, incr;

    float *bwe_exc_extended[CPE_CHANNELS] = { NULL, NULL };

#ifdef FIX_2432_ISM_SPIKES_16KHZ

    int16_t flag_bwe_bws, flaf_swb_tbe;

    int16_t flag_bwe_bws, flag_swb_tbe;

#else

    int16_t flag_bwe_bws;

#endif
@@ -518,12 +518,12 @@ ivas_error ivas_core_dec( 
         *---------------------------------------------------------------------*/



#ifdef FIX_2432_ISM_SPIKES_16KHZ

        flaf_swb_tbe = ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->coder_type != AUDIO && st->coder_type != INACTIVE && st->core_brate >= SID_2k40 && st->core == ACELP_CORE && !st->con_tcx && output_Fs >= 32000 && st->bwidth > NB && st->bws_cnt > 0 ) );

        flag_swb_tbe = ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->coder_type != AUDIO && st->coder_type != INACTIVE && st->core_brate >= SID_2k40 && st->core == ACELP_CORE && !st->con_tcx && output_Fs >= 32000 && st->bwidth > NB && st->bws_cnt > 0 ) );

#endif

        flag_bwe_bws = ( output_Fs >= 32000 && st->core == ACELP_CORE && st->bwidth > NB && st->bws_cnt > 0 && st->bfi == 0 );



#ifdef FIX_2432_ISM_SPIKES_16KHZ

        if ( flaf_swb_tbe )

        if ( flag_swb_tbe )

#else

        if ( st->extl == SWB_TBE || st->extl == FB_TBE || ( st->coder_type != AUDIO && st->coder_type != INACTIVE && st->core_brate >= SID_2k40 && st->core == ACELP_CORE && !st->con_tcx && output_Fs >= 32000 && st->bwidth > NB && st->bws_cnt > 0 ) )

#endif
@@ -545,7 +545,7 @@ ivas_error ivas_core_dec( 


#ifdef FIX_2432_ISM_SPIKES_16KHZ

        /* set hb_synth[n] buffer to zeros in case of no BWE decoding */

        if ( ( st->core == ACELP_CORE && ( st->extl == -1 || st->extl == SWB_CNG || ( st->extl == WB_BWE && st->bws_cnt > 0 && flaf_swb_tbe == 0 ) ) ) && flag_bwe_bws == 0 )

        if ( ( st->core == ACELP_CORE && ( st->extl == -1 || st->extl == SWB_CNG || ( st->extl == WB_BWE && st->bws_cnt > 0 && flag_swb_tbe == 0 ) ) ) && flag_bwe_bws == 0 )

#else

        if ( ( st->core == ACELP_CORE && ( st->extl == -1 || st->extl == SWB_CNG ) ) && flag_bwe_bws == 0 )

#endif