Commit f4eb3aa7 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '595-lib_com-env_stab-c-doesn-t-compile-with-basop_noglob-disabled' into 'main' 

Resolve "lib_com/env_stab.c doesn't compile with BASOP_NOGLOB disabled"

See merge request !815
parents dde28a03 bd48b8af

lib_com/env_stab.c

+4 −0
Original line number Diff line number Diff line
@@ -92,8 +92,12 @@ float env_stability( 
#ifdef BASOP_NOGLOB

        Overflow = 0;

        env_delta = shl_o( *mem_env_delta, 1, &Overflow );

#else

#ifdef FIX_595_SHL_NOGLOB

        env_delta = shl( *mem_env_delta, 1 );

#else

        env_delta = shl_o( *mem_env_delta, 1 );

#endif

#endif

    }

    else

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
#define FIX_569_TD_FILTER_LENGTH                        /* Eri: Issue 569: If an HRTF binary file exceeds the SFX_SPAT_BIN_MAX_FILTER_LENGTH the decoder crashes. This truncates the filter when generated from the model.  */

#define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */

#define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */

#define FIX_595_SHL_NOGLOB                              /* FhG: Issue 595: compilation with BASOP_NOGLOB disabled */

#define UPDATE_FASTCONV_SBA_FILTER                      /* Dlb: Issue 584: Update SBA CLDFB-Domain HRTFs */

#define FIX_570_SF_EXT_ORIENTATION

#define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */
@@ -214,7 +215,6 @@ 
/* ##################### End NON-BE CR switches ########################### */







/* ################## End DEVELOPMENT switches ######################### */



/* clang-format on */