Commit e24fcdf2 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1766_TCX2ACELP_BWE_ISSUE

parent bd4bcf9f

lib_com/options.h

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


#define ISSUE_1836_replace_overflow_libcom                   /* FhG: replace overflow operators by non-overflow-alternatives in lib_com - BE */



#define FIX_1766_TCX2ACELP_BWE_ISSUE                         /* VA : Fix rare BWE issue when switching from TCX to ACELP */

#define FIX_1781_SPECTRAL_GAPS                               /* FhG: Change internal calculation of tcx_noise_factor_ivas_fx() to 32-bit*/

#define FIX_ISSUE_1811_EXCEEDING_W_SHIFTS                    /* FhG: limit exceeding 64bit shifts */

#define FIX_1843_IO_QFACTOR_INIT                             /* FhG: initialize CRend's io_qfactor also in IVAS_rend */

lib_enc/enc_gen_voic_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include "prot_fx_enc.h" /* Function prototypes                    */





#ifdef FIX_1766_TCX2ACELP_BWE_ISSUE

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

 * rem_offset()

 *
@@ -41,7 +40,6 @@ static void rem_offset( 


    return;

}

#endif





/*======================================================================*/
@@ -613,7 +611,6 @@ void encod_gen_voic_ivas_fx( 
        Scale_sig( h1_fx, L_SUBFR, sub( 14, q_h1 ) );             /* set h1[] in Q14 with scaling for convolution Q14*/

        /* scaling of xn[] to limit dynamic at 12 bits */

        Scale_sig( xn_fx, L_SUBFR, shift );

#ifdef FIX_1766_TCX2ACELP_BWE_ISSUE

        test();

        test();

        IF( Es_pred_fx < 0 && LE_16( i_subfr_fx, L_SUBFR ) && NE_16( st_fx->last_core, ACELP_CORE ) )
@@ -622,7 +619,6 @@ void encod_gen_voic_ivas_fx( 
            rem_offset( xn_fx, xn_fx, L_SUBFR );

            rem_offset( cn_fx, cn_fx, L_SUBFR );

        }

#endif



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

         * Close-loop pitch search and quantization