Commit cc8aa421 authored by multrus's avatar multrus
Browse files

slight rework of patch

parent 81a66211

lib_enc/tcx_ltp_enc.c

+9 −13
Original line number Diff line number Diff line
@@ -113,10 +113,9 @@ static void tcx_ltp_pitch_search( 
    const int16_t check_border_case,

    int16_t *border_case )

{

#ifdef FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH

    int16_t i, t, t0, cor_idx, t1, step, fraction, t0_min, t0_max, t_min, t_max, delta;

#else

    int16_t i, t, t0, t1, step, fraction, t0_min, t0_max, t_min, t_max, delta;

#ifdef FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH

    int16_t cor_idx_ini, cor_idx;

#endif

    float temp, cor_max, cor[256], *pt_cor;
@@ -201,7 +200,7 @@ static void tcx_ltp_pitch_search( 
     *-----------------------------------------------------------------*/



#ifdef FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH

    cor_idx = L_INTERPOL1 - t0_min;

    cor_idx_ini = L_INTERPOL1 - t0_min;

#else

    pt_cor = cor + L_INTERPOL1 - t0_min;

#endif
@@ -221,28 +220,25 @@ static void tcx_ltp_pitch_search( 
    {

        fraction = 0;

#ifdef FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH

        cor_max = interpolate_corr( &cor[cor_idx + t0], fraction, pitres );

        cor_idx = cor_idx_ini + t0;

        cor_max = interpolate_corr( &cor[cor_idx], fraction, pitres );

#else

        cor_max = interpolate_corr( &pt_cor[t0], fraction, pitres );

#endif

    }

    else /* Process negative fractions */

    {

#ifdef FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH

        int16_t cor_idx_tmp;



#endif

        t0--;

#ifdef FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH

        cor_idx_tmp = cor_idx + t0;

        cor_max = interpolate_corr( &cor[cor_idx_tmp], fraction, pitres );

        cor_idx = cor_idx_ini + t0;

        cor_max = interpolate_corr( &cor[cor_idx], fraction, pitres );

#else

        cor_max = interpolate_corr( &pt_cor[t0], fraction, pitres );

#endif

        for ( i = ( fraction + step ); i <= pitres - 1; i = i + step )

        {

#ifdef FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH

            temp = interpolate_corr( &cor[cor_idx_tmp], i, pitres );

            temp = interpolate_corr( &cor[cor_idx], i, pitres );

#else

            temp = interpolate_corr( &pt_cor[t0], i, pitres );

#endif
@@ -255,7 +251,7 @@ static void tcx_ltp_pitch_search( 
    }



#ifdef FIX_2272_OOB_INDEXING_IN_LTP_PIT_SEARCH

    cor_idx = t1 + cor_idx;

    cor_idx = cor_idx_ini + t1;

#endif

    for ( i = 0; i <= pitres - 1; i = i + step ) /* Process positive fractions */

    {