Commit eab82817 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2015_PREMPH_SAT_ALT_PART2

parent c2a9cd79

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_1454_FIX_STEREO_TO_FOA_JBM                  /* VA: issue 1454: fix buggy stereo to FOA in JBM */

#define FIX_2015_PREMPH_SAT_ALT_PART2                   /* VA: Add missing scaling factor to be passed to AVQ_cod() */

#define FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH         /* VA: Fix Issue 2253 where the encoder and decoder could get out of sync */

#define NONBE_FIX_1967_SBA_DECODER_MONO_OUT_BIG_DIFFERENCES /* Dolby: Fix basop issue 1967 */

#define FIX_1461_CNG_BW_SWITCHING                       /* Eri: float issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */

lib_enc/enc_higher_acelp_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -490,11 +490,7 @@ void transf_cdbk_enc_ivas_fx( 
     * Split algebraic vector quantizer based on RE8 lattice

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



#ifndef FIX_2015_PREMPH_SAT_ALT_PART2

    AVQ_cod_fx( x_tran, x_norm, nBits, Nsv, 0 );

#else

    AVQ_cod_fx( x_tran, x_norm, nBits, Nsv, Qdct );

#endif



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

     * Find prequantizer excitation gain