Commit b25497ac authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge branch... 

Merge branch 'basop-2527-regression2553-basop-assert-in-omasa-encoder-inside-nonbe_fix_issue_2206_swb_experiment' into 'main'

Resolve "[Regression2553] Basop assert in OMASA encoder inside NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT"

Closes #2527

See merge request !2950
parents 92a66195 abb9edec

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#define NONBE_FIX_ISSUE_2206_TD_CHANNEL_EXTRAPOLATION   /* FhG: Use different scale to avoid saturation of LPC coefficient in TD Stereo signal extrapolation. */

#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 FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM            /* Eri: Basop issue 2453: Fix alignment of peak_avrg_ratio_fx */

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

#define FIX_1527_CMR_BITRATE_IDX                        /* Fix for incorrect bitrate idx packed in rtp CMR E-byte */

lib_enc/swb_tbe_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -4895,7 +4895,11 @@ static void gainFrSmooth_En_fx( 
        IF( NE_32( st_fx->total_brate, ACELP_24k40 ) )

        {

#ifdef NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT

#ifdef NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527

            Scale_sig( hBWE_TD->shb_inv_filt_mem_fx, LPC_SHB_ORDER, sub( shb_frame_q, hBWE_TD->shb_inv_filt_mem_q ) );

#else

            scale_sig( hBWE_TD->shb_inv_filt_mem_fx, LPC_SHB_ORDER, sub( shb_frame_q, hBWE_TD->shb_inv_filt_mem_q ) );

#endif

            hBWE_TD->shb_inv_filt_mem_q = shb_frame_q;

            move16();

#endif