Commit 154fcf0d authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/fix_binaural_delay_precision

parents a348a7cd 880ccac7

lib_dec/core_dec_init.c

+4 −2
Original line number Diff line number Diff line
@@ -279,7 +279,11 @@ void open_decoder_LPD( 
            st->last_core_bfi = ACELP_CORE;

        }



#ifdef FIX_301_PLC

        if ( ( ( st->element_mode != IVAS_CPE_DFT ) || ( st->element_mode == IVAS_CPE_DFT && st->prev_bfi ) ) && st->last_codec_mode == MODE1 && st->last_core == ACELP_CORE )

#else

        if ( st->element_mode != IVAS_CPE_DFT && st->last_codec_mode == MODE1 && st->last_core == ACELP_CORE )

#endif

        {

            /* Switching from Mode 1 ACELP */

            st->last_core_bfi = ACELP_CORE;
@@ -670,13 +674,11 @@ void open_decoder_LPD( 
    st->last_tns_active = 0;

    st->second_last_tns_active = 0;

    st->second_last_core = -1;

#ifdef SET_TNS_FLAG_IN_EVERY_FRAME

    /* TODO: also apply for MCT modes, once issue #24 is solved */

    if ( st->hTcxCfg != NULL && !MCT_flag && st->element_mode != EVS_MONO )

    {

        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode );

    }

#endif

    if ( hTcxDec != NULL )

    {

        hTcxDec->tcxltp_second_last_pitch = st->old_fpitch;

lib_dec/core_switching_dec.c

+1 −5
Original line number Diff line number Diff line
@@ -1028,11 +1028,7 @@ void bandwidth_switching_detect( 
    {

        st->bws_cnt1 = 0;

    }

    else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB

#ifdef FIX_299_ISM_BWS

              && st->last_low_rate_mode == 0

#endif

    )

    else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB && st->last_low_rate_mode == 0 )

    {

        st->bws_cnt1++;

    }

lib_dec/init_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -107,9 +107,7 @@ ivas_error init_decoder( 
    st->last_good = UNVOICED_CLAS;

    st->clas_dec = UNVOICED_CLAS;

    st->low_rate_mode = 0;

#ifdef FIX_299_ISM_BWS

    st->last_low_rate_mode = 0;

#endif



    st->lp_gainp = 0.0f;

    st->lp_gainc = 0.0f;

lib_dec/ivas_stereo_mdct_stereo_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -327,19 +327,11 @@ void stereo_decoder_tcx( 
                hStereoMdct->reverse_dmx = 0;

            }



#ifdef FIX_317

            if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_10_CORE ) ? NB_DIV : 1 ) ) )

#else

            if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_20_CORE ) ? 1 : NB_DIV ) ) )

#endif

            {

                v_multc( spec_r[k], nrgRatio, spec_r[k], L_frameTCX_r );

            }

#ifdef FIX_317

            else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_10_CORE ) ? NB_DIV : 1 ) ) )

#else

            else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_20_CORE ) ? 1 : NB_DIV ) ) )

#endif

            {

                v_multc( spec_l[k], 1.0f / nrgRatio, spec_l[k], L_frameTCX_l );

            }

lib_dec/ivas_tcx_core_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -96,13 +96,11 @@ void stereo_tcx_init_dec( 
    st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC );

    hTcxDec->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_flag, st->element_mode );

    st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode );

#ifdef SET_TNS_FLAG_IN_EVERY_FRAME

    /* TODO: also apply for MCT modes, once issue #24 is solved */

    if ( !MCT_flag && st->element_mode != EVS_MONO )

    {

        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode );

    }

#endif

    if ( hTcxLtpDec != NULL )

    {

        hTcxLtpDec->tcxltp = getTcxLtp( st->sr_core );