Commit 2da128c7 authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2248-basop-assert-in-evs-encoder' into 'main' 

Basop 2248 basop assert in evs encoder

See merge request !2631
parents 763a4b80 285fdabc

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
#define FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND /* OR : Fix issue basop 2201 hrtf_file_reader crend differs between basop ivas-main and ivas-float-update */

#define FIX_2245_INIT_FD_CNG_EVS                        /* Dolby/VA: Issue 2245: initialize FD CNG with EVS-type of init function */

#define FIX_2252_SCALING_SAVE_HB_SYNTH                  /* VA: issue 2252: fix use-of-uninit-value in save_hb_synth_fx[] scaling in FOA decoding with bitstream that starts with an SID */

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



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

lib_enc/enc_acelpx_fx.c

+5 −2
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();