Commit 0d0dcc51 authored by vaclav's avatar vaclav
Browse files

port MR

parent 37dc401f

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */

#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */



/* #################### End BASOP porting switches ############################ */

lib_dec/acelp_core_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -992,7 +992,11 @@ ivas_error acelp_core_dec_fx( 
                tmpF_fx = *old_exc_s_fx;

                st->mem_deemph_fx = shl_sat( old_exc_s_fx[st->L_frame - 1], st->Q_syn ); /* Q0 -> Q_syn */

                move16();

#ifdef NONBE_1131_ACELP_OOB

                PREEMPH_FX( old_exc_s_fx, st->preemph_fac, st->L_frame, &tmpF_fx );

#else

                PREEMPH_FX( old_exc_s_fx, st->preemph_fac, L_FRAME16k, &tmpF_fx );

#endif

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

                Scale_sig( st->mem_syn2_fx, M, st->Q_syn ); /* Q0 -> Q_syn */

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