Commit 61f507fe authored by vaclav's avatar vaclav
Browse files

Merge branch '1856-ref-PortFlpMr1640' into 'ivas-float-update' 

[non-BE] Port MR1640 from float to FLP-ref

See merge request !2056
parents c861364a 143ea648

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ 
#define NONBE_SVD_OPTIMIZATION

#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */

#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#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.c

+4 −0
Original line number Diff line number Diff line
@@ -712,7 +712,11 @@ ivas_error acelp_core_dec( 
                old_exc_s = st->old_exc + L_EXC_MEM_DEC - st->L_frame;

                tmpF = *old_exc_s;

                st->mem_deemph = old_exc_s[st->L_frame - 1];

#ifdef NONBE_1131_ACELP_OOB

                preemph( old_exc_s, st->preemph_fac, st->L_frame, &tmpF );

#else

                preemph( old_exc_s, st->preemph_fac, L_FRAME16k, &tmpF );

#endif

                mvr2r( old_exc_s + st->L_frame - M, st->mem_syn2, M );

                residu( Aq, M, old_exc_s, old_exc + L_EXC_MEM_DEC - st->L_frame, st->L_frame );

            }