Commit 55df7b14 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

replace the three NE_32 with EQ_32, in condition guarding the MC->SBA conversion(ivas_mc2sba_fx)

parent 076755ed

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
#define NONBE_FIX_2493_EXTRACT_L_swb_tbe_enc_fx         /* FhG: Fix extract_l overflow inside swb_tbe_enc_fx() */

#define NONBE_FIX_2493_EXTRACT_L_bw_detect_fx           /* FhG: Fix extract_l overflow inside bw_detect_fx(). Saturation, not a optimal fix. */

#define FIX_2493_CHECK_EXTRACT_L_FIX_INSTRUMENTATION    /* FhG: Fix instrumentation related to extract_l. */

#define FIX_BASOP_2655_MC2SBA_GATE                      /* FhG: BASOP #2655: replace the three NE_32 with EQ_32, in condition guarding the MC->SBA conversion(ivas_mc2sba_fx).  */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -704,7 +704,11 @@ ivas_error ivas_dec_fx( 
            test();

            test();

            test();

#ifdef FIX_BASOP_2655_MC2SBA_GATE

            IF( NE_32( st_ivas->transport_config, st_ivas->intern_config ) && ( EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) || EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA2 ) || EQ_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA3 ) ) )

#else

            IF( NE_32( st_ivas->transport_config, st_ivas->intern_config ) && ( NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_FOA ) || NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA2 ) || NE_32( st_ivas->intern_config, IVAS_AUDIO_CONFIG_HOA3 ) ) )

#endif

            {

                IF( GE_16( add( st_ivas->hTransSetup.nchan_out_woLFE, st_ivas->hTransSetup.num_lfe ), add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe ) ) )

                {