Commit 2a65dca1 authored by vaclav's avatar vaclav
Browse files

cleaning

parent 5b7c2a8f

lib_enc/pitch_ol2_fx.c

+27 −31
Original line number Diff line number Diff line
@@ -519,7 +519,6 @@ void StableHighPitchDetect_ivas_fx( 
    diff = L_mac0( L_negate( sum_energy ), EspecdB[pitch_freq_point], tmp );



    /*sum_energy /= (2*pitch_freq_point-1);*/



    exp = norm_s( tmp );

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

    L_tmp = Mult_32_16( sum_energy, tmp1 );
@@ -559,6 +558,7 @@ void StableHighPitchDetect_ivas_fx( 
    {

        diff16 = round_fx_sat( L_shl_sat( diff, 25 ) );

    }



    test();

    test();

    IF( LT_32( *diff_sm, -1280 /*-10.0f Q7*/ ) && LT_32( *energy_sm, 4928 /*38.5f Q7*/ ) && LT_16( diff16, -26214 /*-.8f Q15*/ ) )
@@ -566,6 +566,7 @@ void StableHighPitchDetect_ivas_fx( 
        *predecision_flag = 1;

        move16();

    }



    test();

    test();

    if ( GT_32( *diff_sm, 1280 /*10.0f Q7*/ ) && GT_32( *energy_sm, 10624 /*83.0f Q7*/ ) && GT_16( diff16, 16384 /*.5 Q15*/ ) )
@@ -595,6 +596,7 @@ void StableHighPitchDetect_ivas_fx( 
    L_tmp = L_mac( L_tmp, *LF_EnergyRatio_sm, 30720 );

    *LF_EnergyRatio_sm = round_fx( L_tmp );

    move16();



    test();

    if ( GT_16( *LF_EnergyRatio_sm, 4480 /*35.0f Q7*/ ) || GT_16( ratio, 6400 /*50.0f Q7*/ ) )

    {
@@ -649,33 +651,28 @@ void StableHighPitchDetect_ivas_fx( 
    move16();



    /* final short pitch detection */

#ifdef HARM_PREPROC

    *flag_spitch = 0;

    move16();

    test();

    test();

    test();

    test();

    test();

    test();

    test();

    *flag_spitch = 0;

    move16();



#ifdef HARM_PREPROC

    IF( element_mode == EVS_MONO )

    {

    IF( ( EQ_16( localVAD, 1 ) ) && ( EQ_16( *predecision_flag, 1 ) ) &&

            ( GT_16( *voicing0_sm, 16384 ) ) && ( GT_16( *voicing0_sm, mult_r( *voicing_sm, 21299 ) ) ) )

        {

            *flag_spitch = 1;

            move16();

            pitch[0] = Tp;

            move16();

            pitch[1] = Tp;

            move16();

            pitch[2] = Tp;

        ( ( EQ_16( element_mode, EVS_MONO ) && GT_16( *voicing0_sm, 16384 ) && GT_16( *voicing0_sm, mult_r( *voicing_sm, 21299 ) ) ) ||

          ( NE_16( element_mode, EVS_MONO ) && GT_16( *voicing0_sm, 21299 /*.65f in Q15*/ ) && GT_16( *voicing0_sm, mult_r( *voicing_sm, 22938 /*.7f in Q15*/ ) ) ) ) )

#else

    test();

    test();

    test();

    *flag_spitch = 0;

    move16();

        }

    }

    ELSE

#endif

    {

    IF( ( EQ_16( localVAD, 1 ) ) && ( EQ_16( *predecision_flag, 1 ) ) &&

        ( GT_16( *voicing0_sm, 21299 /*.65f in Q15*/ ) ) && ( GT_16( *voicing0_sm, mult_r( *voicing_sm, 22938 /*.7f in Q15*/ ) ) ) )

#endif

    {

        *flag_spitch = 1;

        move16();
@@ -686,7 +683,6 @@ void StableHighPitchDetect_ivas_fx( 
        pitch[2] = Tp;

        move16();

    }

    }



    return;

}