Commit 729eca35 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 2247-accelerate-basop_util_addmant32exp
parents bffde9d7 569b23c9

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -86,12 +86,14 @@ 
#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1435_MOVE_STEREO_PANNING                    /* VA: issue 1435: do the EVS stereo panning in the renderer */





/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

/* 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() */

lib_enc/enc_higher_acelp_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -490,7 +490,11 @@ 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