Commit cd39966c authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_856_TCX_LTP_SYNTH_FILTER

parent 433a95f5

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ 


#define NONBE_FIX_BINARY_BINAURAL_READING                     /* Orange: Add support for reading binaural binary file */

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB                        /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_FIX_944_FEC_OMASA_1SEP_OBJ_MASA                 /* Nokia: issue 944: fix FEC error in OMASA */

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER           /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

#define NONBE_FIX_949_MC_5MS_FRAMING                          /* Dlb: issue 949: fix for issue 949, distorted output in MC mode with 5ms framing*/

lib_com/tcx_ltp.c

+0 −9
Original line number Diff line number Diff line
@@ -740,11 +740,7 @@ static void tcx_ltp_synth_filter_11_unequal_pitch( 
    gain = prev_gain;

    gain_step = -prev_gain / length;



#ifdef NONBE_FIX_856_TCX_LTP_SYNTH_FILTER

    for ( j = 0; j < length; j++ )

#else

    for ( j = 0; j < length + L; j++ )

#endif

    {

        s = 0;

        s2 = 0;
@@ -765,14 +761,9 @@ static void tcx_ltp_synth_filter_11_unequal_pitch( 
        gain += gain_step;

    }



#ifdef NONBE_FIX_856_TCX_LTP_SYNTH_FILTER

    mvr2r( out - L, temp_buf, length + L );

    mvr2r( in + length, temp_buf + length + L, L );

    temp_ptr = &temp_buf[0] + L;

#else

    mvr2r( out - MAX_TCX_LTP_FILTER_LEN, temp_buf, MAX_TRANSITION_LEN + 2 * MAX_TCX_LTP_FILTER_LEN );

    temp_ptr = &temp_buf[0] + MAX_TCX_LTP_FILTER_LEN;

#endif



    m0 = temp_ptr;

    m1 = temp_ptr - 1;