Commit 616d74e6 authored by vaillancour's avatar vaillancour
Browse files

Fix proposal for 2253

parent 43ca007c
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@
/*#define FIX_I4_OL_PITCH*/                                  /* fix open-loop pitch used for EVS core switching */
#define FIX_1990_SANITIZER_IN_REVERB_LOAD                    /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */
#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK            /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

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

/* #################### Start BASOP porting switches ############################ */
+4 −1
Original line number Diff line number Diff line
@@ -455,8 +455,11 @@ Word16 Pit_exc_contribution_len_ivas_fx( /* o : bin wher
        Mbands_loc = MBANDS_LOC;
        move16();
    }

#ifndef FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH
    minimum_fx( pitch_buf, nb_subfr, &low_pit );
#else
    minimum_fx( pitch_buf, shr( st_fx->L_frame, 6 ), &low_pit );
#endif
    exp1 = norm_s( low_pit );
    tmp = shl( low_pit, exp1 );
    tmp_dec = 12800;