Commit f9553456 authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2540-ltv-regression-from-2507-missing-signal' into 'main' 

[non-BE] Resolve "LTV regression from #2507: missing signal"

Closes #2540

See merge request !2967
parents 11cd64e9 0b9a1eb3

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2 /* FhG: Avoid overflow of SWB_fenv_fx in SWB_BWE_encoding_fx because of very small energies. */

#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define NONBE_FIX_2507                                  /* Fix porting error in SQ_gain_estimate_fx() */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define HARMONIZE_2499_CONFIGUREFDCNGDEC                /* FhG: basop issue 2499: harmonoize configureFdCngDec */

#define FIX_BASOP_2530_IVAS_DECISION_MAT                /* VA: Fix ambiguous usage of extract_l() */

lib_enc/tcx_utils_enc_fx.c

+10 −0
Original line number Diff line number Diff line
@@ -1237,6 +1237,15 @@ Word16 SQ_gain_estimate_fx( 
            if ( GT_32( tmp32, 0xFF20 ) ) /* 0xFF20 -> 0.3*log2(10); */

            {

                ener = L_add( ener, tmp32 );

#ifdef NONBE_FIX_2507

                /* if SNR is above target -> break and increase offset */

                IF( GT_32( ener, target ) )

                {

                    offset = L_add( offset, fac );

                    BREAK;

                }

            }

#else

            }



            /* if SNR is above target -> break and increase offset */
@@ -1245,6 +1254,7 @@ Word16 SQ_gain_estimate_fx( 
                offset = L_add( offset, fac );

                BREAK;

            }

#endif

        }

    }