Commit c15b61e2 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '737-energy-drop-when-switching-from-hq_core-to-acelp' into 'main' 

Proposed fix for issue 737: scaling error in excitation memory after HQ->ACELP switch

Closes #737

See merge request !293
parents 894ae474 3a1c7461

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ 
#define FIX_740_HQ_CORE_OVA // Proposed fix to solve overlap and add issue for HQ_CORE

#define FIX_746  // proposed fix to solve low bit-rate frame boundaries issues 

#define FIX_SATURATION_725  // Propose fix for saturation in AVQ

#define FIX_737_HQ_ACELP_SWITCH_SCALING_ERROR /* Eri: Proposed fix for issue 737: scaling error in excitation memory after HQ->ACELP switch */

/* ################## End DEVELOPMENT switches ######################### */



/* clang-format on */

lib_dec/acelp_core_dec_ivas_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -788,6 +788,9 @@ ivas_error acelp_core_dec_ivas_fx( 
                preemph_fx( old_exc_s_fx, st->preemph_fac, L_FRAME16k, &tmpF_fx );

                Copy(old_exc_s_fx + st->L_frame - M, st->mem_syn2_fx, M );

                Residu3_fx( Aq_fx, old_exc_s_fx, old_exc_fx + L_EXC_MEM_DEC - st->L_frame, st->L_frame, 0 );

#ifdef FIX_737_HQ_ACELP_SWITCH_SCALING_ERROR

                Scale_sig( old_exc_fx + L_EXC_MEM_DEC - st->L_frame, st->L_frame, st->Q_exc );

#endif

            }



            if ( st->last_core != ACELP_CORE && st->element_mode > EVS_MONO )