Commit 5b7c2a8f authored by vaclav's avatar vaclav
Browse files

fix EVS BE

parent ad92c9b3

lib_enc/pitch_ol2_fx.c

+13 −1
Original line number Diff line number Diff line
@@ -489,7 +489,19 @@ void StableHighPitchDetect_ivas_fx( 
    /* pitch_freq_point = (short)(L_FFT/(mult_fact*T_op[1])+0.5f);*/

    Top = pitch[1];

    move16();

#ifdef HARM_PREPROC

    IF( element_mode == EVS_MONO )

    {

        exp = norm_s( Top );

        tmp = div_s( shl( 1, sub( 14, exp ) ), Top );                                   /*Q(29 - exp)*/

        L_tmp = L_mult0( tmp, L_FFT );

        pitch_freq_point = extract_h( L_add( L_shl( L_tmp, sub( exp, 13 ) ), 32768 ) ); /* Q0*/

    }

    ELSE

#endif

    {

        pitch_freq_point = idiv1616( L_FFT, Top ); /* Q0*/

    }

    sum_energy = L_deposit_l( 0 );

    FOR( i = 1; i < 2 * pitch_freq_point; i++ )

    {

lib_enc/vad_fx.c

+3 −4
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ Word16 ivas_dtx_hangover_addition_fx( 
    Word16 hangover_short_dtx; /* Q0 */

    Word16 flag_dtx;           /* Q0 */

    Word16 tmp;                /* Q0 */



    if ( hNoiseEst == NULL )

    {

        hNoiseEst = st_fx->hNoiseEst;
@@ -451,7 +452,6 @@ Word16 ivas_dtx_hangover_addition_fx( 
        hVAD = st_fx->hVAD;

    }





    flag_dtx = 0;

    move16();
@@ -486,7 +486,6 @@ Word16 ivas_dtx_hangover_addition_fx( 
    }



    /* Only allow short HO if not sufficient active frames in clean speech*/



    tmp = 3;

    move16(); /* default for EVS*/

    if ( EQ_16( st_fx->core, AMR_WB_CORE ) )
@@ -519,13 +518,13 @@ Word16 ivas_dtx_hangover_addition_fx( 
        }

    }





    /* hangover adjustment from  combined  FFT+CLDFBVAD */

    IF( NE_16( st_fx->core, AMR_WB_CORE ) )

    {

        hangover_short_dtx = sub( hangover_short_dtx, cldfb_subtraction ); /*Q0*/

        hangover_short_dtx = s_max( hangover_short_dtx, 0 );

    }



    IF( vad_flag != 0 ) /* Speech present */

    {

        flag_dtx = 1;