Commit 46d9091c authored by emerit's avatar emerit
Browse files

Merge branch 'main' into 1963_basop_portFltMR-1568-1471-1690

parents 06a8cc61 e46fc474

.gitlab-ci/variables.yml

+1 −0
Original line number Diff line number Diff line
@@ -104,3 +104,4 @@ variables: 
      - 'peaq-enc-passthrough'

      - 'long-term-logs'

      - 'backup-long-term-logs'

      - 'test-long-self-test'

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ 
#define FIX_ISSUE_2004_LPC_SHB_SAT                           /* Dolby: Issue 2004: prevent saturation of the LPC SHB filter */



#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

+15 −0
Original line number Diff line number Diff line
@@ -1630,14 +1630,26 @@ ivas_error core_switching_post_dec_ivas_fx( 
            test();

            IF( EQ_16( st_fx->last_core, HQ_CORE ) || st_fx->last_core == TCX_20_CORE || st_fx->last_core == TCX_10_CORE ) /*  MDCT to ACELP transition */

            {

#ifdef FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES

                Word16 Q_old_postdec = 0;

                move16();

#endif

                Qtmp = s_min( *Qsynth, 0 );

                IF( hHQ_core != NULL )

                {

                    Qtmp = s_min( s_min( *Qsynth, hHQ_core->Q_old_postdec ), hHQ_core->Q_old_wtda );

#ifdef FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES

                    Q_old_postdec = hHQ_core->Q_old_postdec;

                    move16();

#endif

                }



                Scale_sig( synth, output_frame, sub( Qtmp, *Qsynth ) ); /* Qtmp */

#ifndef FIX_ISSUE_2013_MDCT_STEREO_DTX_DISCONTINUITIES

                Scale_sig( st_fx->delay_buf_out_fx, delay_comp, Qtmp ); /*delay buff_out_fx is Q0*/

#else

                Scale_sig( st_fx->delay_buf_out_fx, delay_comp, sub( Qtmp, Q_old_postdec ) ); /* delay buff_out_fx is Qtmp */

#endif

                IF( hHQ_core != NULL )

                {

                    Scale_sig( hHQ_core->old_out_fx, L_FRAME48k, sub( Qtmp, hHQ_core->Q_old_wtda ) ); /* Qtmp */
@@ -1695,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