Commit 059013b9 authored by vasilache's avatar vasilache Committed by emerit
Browse files

fix 1056 BASOP related

parent 5004d5cb

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,9 @@ 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

#define DELTA_PHI_PRECISION                     100.0f

#endif

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

#define MINIMUM_BIT_BUDGET_NORMAL_META          100

#define DIFF_DFRATIO_2BIT_LIMIT_IDX_HODIRAC     4

lib_com/options.h

+2 −6
Original line number Diff line number Diff line
@@ -172,12 +172,8 @@ 
/* all switches in this category should start with "NONBE_" */



#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_1240_FIX_CORE_SELECTION_ISM_SW            /* VA: issue 1240: Remove the forcing of the TCX core in ISM when switching from a high bitarte to a low one */

#define NONBE_1246_INF_COHERENCE_IN_HIGH_LEVEL_DTX      /* Ericsson: Issue 1246: High level input which triggers DTX can lead to numerical overflow in coherence calculation */

#define NONBE_1211_DTX_BR_SWITCHING                     /* VA: issue 1211: fix crash in MASA DTX bitrate switching */

#define NONBE_1217_INIT_OBJ_EDIT                        /* VA: issue 1217: do object editing only when objects metadata is available */

#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */



#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 */

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



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

lib_dec/ivas_masa_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -2418,13 +2418,23 @@ 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

                    /* 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

                    if ( azimuth - hMasaIsmData->q_azimuth_old[obj] > delta_phi )

#endif

                    {

                        azimuth -= delta_phi;

                    }

                    else

                    {

#ifdef NONBE_1056_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

                        if ( hMasaIsmData->q_azimuth_old[obj] - azimuth > delta_phi )

#endif

                        {

                            azimuth += delta_phi;

                        }