diff --git a/lib_com/options.h b/lib_com/options.h index 5a3e09fe6096fc38a9076b4a456b4921e911aaf7..e5aea3ee7115b05d6ea963f6d99d7f97f59768ee 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -151,10 +151,12 @@ #define SIMPLIFY_SBA_RENDERING_LOGIC /* SBA rendering maintenance related to ticket #45 */ #define SBA_CLEANING /* SBA maintenance related to ticket #45 */ -#define REFACTOR_REVERB_INIT_ADD_CFG_CHECKS /* Simplify and improve reverb initialization + add range checks on config parameter values */ +#define REFACTOR_REVERB_INIT_ADD_CFG_CHECKS /* Simplify and improve reverb initialization + add range checks on config parameter values */ #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 diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec.c index 4bdf5ed614de0ebe46bdd72d013bd4fe9a310195..a18f68225b323e8755f03698c0f0bb9e32cd7b99 100644 --- a/lib_dec/ivas_masa_dec.c +++ b/lib_dec/ivas_masa_dec.c @@ -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 ) );