Commit 38878254 authored by multrus's avatar multrus
Browse files

merge from main

parents e4cf58fb 129bbb81

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ 
#define FIX_1053_REVERB_RECONFIGURATION

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */

#define FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */

#define FIX_1376_MISSING_ISM_METADATA                   /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_mdct_core_dec_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -1420,8 +1420,11 @@ void ivas_mdct_core_reconstruct_fx( 
        {

            Copy_Scale_sig_16_32_no_sat( st->p_bpf_noise_buf, st->p_bpf_noise_buf_32, st->L_frame, Q11 ); // Q0 -> Q11

        }



#ifndef FIX_938_COMPILER_WARNING

        IF( signal_outFB_fx[ch] != NULL )

        {

#endif

            Copy( synthFB_fx, signal_outFB_fx[ch], st->hTcxDec->L_frameTCX );

#ifdef FIX_2003_CON_TCX_OVERFLOW

            e_sig[ch] = sub( 15, q_syn + st->Q_syn_factor );
@@ -1429,7 +1432,9 @@ void ivas_mdct_core_reconstruct_fx( 
        e_sig[ch] = sub( 15, q_syn );

#endif

            move16();

#ifndef FIX_938_COMPILER_WARNING

        }

#endif



        /* updates */

        st->last_voice_factor_fx = 0;