Commit 30fa8df7 authored by vaclav's avatar vaclav
Browse files

step 2 (dtx_hangover_addition_fx)

parent 584d51b1

lib_enc/amr_wb_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -310,7 +310,11 @@ void amr_wb_enc_fx( 
    }



    /* apply DTX hangover for CNG analysis */

#ifdef HARM_PREPROC

    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, NULL );

#else

    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 );

#endif



    /*-----------------------------------------------------------------*

     * Select SID or FRAME_NO_DATA frame if DTX enabled

lib_enc/ivas_core_pre_proc_front_fx.c

+7 −2
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ ivas_error pre_proc_front_ivas_fx( 
    move16();

    st->mem_preemph_DFT_fx_q_inp = shl_sat( st->mem_preemph_DFT_fx_q_inp, sub( st->q_inp, st->mem_preemph_q ) ); /*st->q_inp*/

    move16();



    test();

    IF( EQ_16( element_mode, IVAS_CPE_DFT ) )

    {
@@ -757,7 +758,11 @@ ivas_error pre_proc_front_ivas_fx( 
    test();

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

    {

#ifdef HARM_PREPROC

        *vad_flag_dtx = dtx_hangover_addition_fx( st, st->vad_flag, extract_h( L_sub( st->lp_speech_32fx, st->lp_noise_32fx ) ), 0, vad_hover_flag, NULL, NULL, NULL ); /* Q0 */

#else

        *vad_flag_dtx = ivas_dtx_hangover_addition_fx( st, st->vad_flag, extract_h( L_sub( st->lp_speech_32fx, st->lp_noise_32fx ) ), 0, vad_hover_flag, NULL, NULL, NULL ); /* Q0 */

#endif

        move16();

    }

    ELSE

lib_enc/ivas_front_vad_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -286,7 +286,12 @@ ivas_error front_vad_fx( 
                sts[1]->last_coder_type = sts[0]->last_coder_type; /* Q0 */

                move16();

            }



#ifdef HARM_PREPROC

            vad_flag_dtx[n] = dtx_hangover_addition_fx( sts[n], hFrontVad->hVAD->vad_flag, sub( hFrontVad->lp_speech_fx, hFrontVad->lp_noise_fx ), 0 /* <- no cldfb addition */, &vad_hover_flag[n], hFrontVad->hVAD, hFrontVad->hNoiseEst, &hFrontVads[n]->rem_dtx_ho ); /* Q0 */

#else

            vad_flag_dtx[n] = ivas_dtx_hangover_addition_fx( sts[n], hFrontVad->hVAD->vad_flag, sub( hFrontVad->lp_speech_fx, hFrontVad->lp_noise_fx ), 0 /* <- no cldfb addition */, &vad_hover_flag[n], hFrontVad->hVAD, hFrontVad->hNoiseEst, &hFrontVads[n]->rem_dtx_ho ); /* Q0 */

#endif

            move16();



            if ( EQ_16( n_chan, 1 ) )

lib_enc/pre_proc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -282,7 +282,11 @@ void pre_proc_fx( 
    }



    /* apply DTX hangover for CNG analysis */

#ifdef HARM_PREPROC

    vad_flag_dtx = dtx_hangover_addition_fx( st, st->vad_flag, sub( st->lp_speech_fx, st->lp_noise_fx ), cldfb_addition, vad_hover_flag, hVAD, hNoiseEst, NULL );

#else

    vad_flag_dtx = dtx_hangover_addition_fx( st, st->vad_flag, sub( st->lp_speech_fx, st->lp_noise_fx ), cldfb_addition, vad_hover_flag, hVAD, hNoiseEst );

#endif



    /*----------------------------------------------------------------*

     * NB/WB/SWB/FB bandwidth detector

lib_enc/prot_fx_enc.h

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ void dtx_ivas_fx( 
);



Word16 dtx_hangover_addition_fx(

#ifndef HARM_PREPROC

    Encoder_State *st_fx,           /* i/o: encoder state structure */

    const Word16 vad_flag,          /* i   Q0   */

    const Word16 lp_snr,            /* i   Q8   */
@@ -166,6 +167,7 @@ Word16 dtx_hangover_addition_fx( 
);



Word16 ivas_dtx_hangover_addition_fx(

#endif

    Encoder_State *st_fx,           /* i/o: encoder state structure */

    const Word16 vad_flag,          /* i   Q0   */

    const Word16 lp_snr,            /* i   Q8   */