Commit dbaa1e12 authored by vaillancour's avatar vaillancour
Browse files

Fix assert in EVS path

parent 1c5efba7

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#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 */

#define FIX_2248_EVS_ASSERT                             /* VA: Include _sat in an EVS related part of the code */





/* #################### End BE switches ################################## */
@@ -97,7 +98,6 @@ 
#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 */





/* ##################### End NON-BE switches ########################### */



/* ################## End MAINTENANCE switches ######################### */

lib_enc/enc_acelpx_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -293,8 +293,11 @@ static void E_ACELP_1pulse_searchx_fx( 
    ps0 = *ps; /* Qdn */

    move16();

    alp0 = L_deposit_h( *alp );             /* Q22 */

#ifndef FIX_2248_EVS_ASSERT

    alp0 = L_mac( alp0, R[0], sign_val_1 ); /* Qalp = (Q_R=Q_cor)*Q_signval */



#else

    alp0 = L_mac_sat( alp0, R[0], sign_val_1 ); /* Qalp = (Q_R=Q_cor)*Q_signval */

#endif

    /* Ensure that in the loop below s > 0 in the first iteration, the actual values do not matter. */

    move16();

    move16();