Commit 3dbb2b56 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'bug_fix_dtx_hangover_addition_fx' into 'main' 

Bug fix in dtx_hangover_addition_fx, integration and Q correction of ITF_Detect_IVAS

See merge request !1122
parents 1056c027 ee599155

lib_enc/acelp_core_enc_fx.c

+1 −0
Original line number Diff line number Diff line
@@ -1377,6 +1377,7 @@ ivas_error acelp_core_enc_ivas_fx( 
            move16();

            PREEMPH_FX( hLPDmem->old_exc, st->preemph_fac, st->L_frame, &tmpF_fx );

            Copy( hLPDmem->old_exc + sub( st->L_frame, M ), hLPDmem->mem_syn, M ); /* Q_new */

            Scale_sig( st->hLPDmem->mem_syn, M, sub( st->hLPDmem->q_mem_syn, Q_new ) );

            Residu3_fx( Aq, hLPDmem->old_exc, old_exc_fx, st->L_frame, 0 );

        }

lib_enc/ivas_core_pre_proc_front.c

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ ivas_error pre_proc_front_ivas_fx( 
    test();

    IF( ( hCPE != NULL && !( lr_vad_enabled && st->idchan == 0 ) ) || hSCE != NULL )

    {

        *vad_flag_dtx = dtx_hangover_addition_fx( st, st->vad_flag, sub( st->lp_speech_fx, st->lp_noise_fx ), 0, vad_hover_flag, NULL, NULL ); /* Q0 */

        *vad_flag_dtx = ivas_dtx_hangover_addition_fx( st, st->vad_flag, sub( st->lp_speech_fx, st->lp_noise_fx ), 0, vad_hover_flag, NULL, NULL, NULL ); /* Q0 */

        move16();

    }

    ELSE

lib_enc/tcx_utils_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -3932,7 +3932,7 @@ void ProcessStereoIGF_fx( 
        predictionGain = 0;

        move16();



        ITF_Detect_fx( hIGFEnc[ch]->spec_be_igf, hIGFEnc[ch]->infoStartLine, hIGFEnc[ch]->infoStopLine, 8 /*maxOrder*/, A, &Q_A, &predictionGain, &curr_order, sub( 31, hIGFEnc[ch]->spec_be_igf_e ) );

        ITF_Detect_ivas_fx( hIGFEnc[ch]->spec_be_igf, hIGFEnc[ch]->infoStartLine, hIGFEnc[ch]->infoStopLine, 8 /*maxOrder*/, A, &Q_A, &predictionGain, &curr_order, sub( 31, hIGFEnc[ch]->spec_be_igf_e ) );



        test();

        hIGFEnc[ch]->flatteningTrigger = LT_32( hIGFEnc[ch]->tns_predictionGain, ONE_POINT_ONE_FIVE_Q23 ) && LT_32( predictionGain, ONE_POINT_ONE_FIVE_Q7 );

lib_enc/vad_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ Word16 ivas_dtx_hangover_addition_fx( 
        test();

        test();

        test();

        if ( ( GT_16( hVAD->prim_act_he_fx, 31129 ) ) && ( GT_16( hNoiseEst->Etot_lp_fx, 40 * 256 ) ) && ( GT_16( hVAD->vad_prim_cnt_16, 14 ) ) && ( GT_16( hVAD->vad_flag_cnt_50, 48 ) ) ) /* 45 requires roughly > 95% flag activity */

        if ( ( GT_16( hVAD->prim_act_he_fx, 32113 ) ) && ( GT_16( hNoiseEst->Etot_lp_fx, 40 * 256 ) ) && ( GT_16( hVAD->vad_prim_cnt_16, 14 ) ) && ( GT_16( hVAD->vad_flag_cnt_50, 48 ) ) ) /* 45 requires roughly > 95% flag activity */

        {

            hVAD->hangover_cnt_music = 0;

            move16();