Commit 855208a3 authored by malenov's avatar malenov
Browse files

cleanup FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC_FP

parent d9a10dfa

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ 


/* ################### Start FIXES switches ########################### */



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

#define NONBE_FIX_1205_TD_STEREO_MOD_CT                 /* VA: fix mismatch of coder_type (mod_ct) btw. TD stereo encoder and decoder */

#define NONBE_FIX_1213_SBA_DET_MAT_INV_3BY3             /*Dolby: issue 1213: fix for inverse of det < 0*/

#define NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING    /* FhG: fixes for decoder-side noise level estimation in MDCT-Stereo to prevent noise bursts in stereo switching */

lib_dec/ivas_masa_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -2347,21 +2347,13 @@ 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 FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC_FP

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

#else

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

#endif

                    {

                        azimuth -= delta_phi;

                    }

                    else

                    {

#ifdef FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC_FP

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

#else

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

#endif

                        {

                            azimuth += delta_phi;

                        }