Commit 13cc30c8 authored by vasilache's avatar vasilache
Browse files

correct issue number if switch for 1230

parent c0a28b0a

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ enum 
#define MASA_ANGLE_TOLERANCE                    0.5f

#define MASA_SUR_COH_THRESHOLD                  1e-7f

#define MASA_SUR_COH_PRECISION                  1e7f

#ifdef NONBE_1056_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP

#ifdef NONBE_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP

#define DELTA_PHI_PRECISION                     100.0f

#endif

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ 


#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */

#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */

#define NONBE_1056_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP        /* Nokia: Fixes ivas_decode_masaism_metadata decision logic change due to precision difference; this is the fix in floating point */

#define NONBE_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP        /* Nokia: Fixes ivas_decode_masaism_metadata decision logic change due to precision difference; this is the fix in floating point */

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



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

lib_dec/ivas_masa_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -2418,7 +2418,7 @@ static int16_t ivas_decode_masaism_metadata( 
                if ( azimuth * hMasaIsmData->q_azimuth_old[obj] > 0 )

                {

                    delta_phi = 180.0f / (float) ( no_phi_masa[bits_ism[obj] - 1][idx_el] ); /* 360/2*/

#ifdef NONBE_1056_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP

#ifdef NONBE_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP

                    /* this is equivalent to testing if 'azimuth - hMasaIsmData->q_azimuth_old[obj] > delta_phi' with limited precision */

                    if ( roundf( DELTA_PHI_PRECISION * ( no_phi_masa[bits_ism[obj] - 1][idx_el] ) * ( azimuth - hMasaIsmData->q_azimuth_old[obj] ) ) / DELTA_PHI_PRECISION > 180.0f )

#else
@@ -2429,7 +2429,7 @@ static int16_t ivas_decode_masaism_metadata( 
                    }

                    else

                    {

#ifdef NONBE_1056_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP

#ifdef NONBE_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP

                        /* this is equivalent to testing if 'hMasaIsmData->q_azimuth_old[obj] - azimuth > delta_phi' with limited precision */

                        if ( roundf( DELTA_PHI_PRECISION * ( no_phi_masa[bits_ism[obj] - 1][idx_el] ) * ( hMasaIsmData->q_azimuth_old[obj] - azimuth ) ) / DELTA_PHI_PRECISION > 180.0f )

#else