Commit 5e73fea8 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_34

parent 8eb2eb26

lib_com/options.h

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




#define DIRAC_DRCT_GAIN_TUNING                          /* issue 64: tuning of DirAC energy-compensation gains */

#define FIX_34                                          /* Nokia: Fix bug in MASA format EXT output spherical indexing */

#define FIX_I54_LS_CONVERSION                           /* FhG: fix incorrect downmix matrix for 5_1_4 to 5_1_2 and upmix matrix for 7_1 to 7_1_4 */

#define FIX_I25_FBE_FB_BITS                             /* issue 25: properly skip reading of TBE FB bits when decoder output sampling rate is not 48 kHz */

#define ORDER_BITS_ADDITION                             /* issue 14: Transmit SBA order and planar bits at all bitrates */

lib_dec/ivas_masa_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -643,11 +643,7 @@ static uint16_t index_theta_phi_16( 
        }

        else

        {

#ifdef FIX_34

            theta = MASA_ANGLE_AT_EQUATOR * (float) ( id_th + 0.5f );

#else

            theta = MASA_NTOT2_FAC * (float) ( id_th + 0.5f );

#endif

            if ( id_th == 1 )

            {

                cum_n = 2 * (uint16_t) ceilf( MASA_NTOT2_FAC * ( sinf( theta ) - MASA_ASIN_OFFSET ) );