Commit e46fc474 authored by multrus's avatar multrus
Browse files

Merge branch '2013-48-kbit-s-stereo-dtx-on-decoder-introduces-clicks-fer' into 'main' 

[non-BE][allow-regression] Resolve issue 2013 discontinuities for 48 kbps stereo with FER

Closes #2013

See merge request !2235
parents dcf1701a 93eb68e2

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ 


#define FIX_2009_HIGH_NOISE_FLOOR_FOR_FX_DEC                 /* FhG: Corrected the q_input in the input of generate_masking_noise_dirac_ivas_fx() */

#define FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES       /* Eri/FhG: Issue 2013 fix for dtx discontinuities */

#define FIX_ISSUE_2013_MDCT_STEREO_FER_DISCONTINUITIES       /* Eri/FhG: Issue 2013 fix for FER discontinuities */



/* #################### Start BASOP porting switches ############################ */



#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

lib_dec/core_switching_dec_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -1707,6 +1707,9 @@ ivas_error core_switching_post_dec_ivas_fx( 
                        move16();

                        ptmp1++;

                        ptmp2++;

#ifdef FIX_ISSUE_2013_MDCT_STEREO_FER_DISCONTINUITIES

                        tmpF = add( tmpF, tmp ); /* Q15 */

#endif

                    }

                }

                ELSE