Commit 385e84d2 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '34-bug-in-masa-format-ext-output-spherical-indexing' into 'main' 

Resolve "Bug in MASA format EXT output spherical indexing" [non-BE]

See merge request !10
parents d12242a3 d5795155

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ 


#define DIRAC_DRCT_GAIN_TUNING



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



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

/* clang-format on */

#endif

lib_dec/ivas_masa_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -643,7 +643,11 @@ 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 ) );