Loading lib_com/ivas_cnst.h +0 −9 Original line number Diff line number Diff line Loading @@ -1132,7 +1132,6 @@ enum #define MASA_MAXIMUM_DIRECTIONS 2 #define MASA_MAX_TRANSPORT_CHANNELS 2 #define MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS 5 #define MASA_DELTA_AZI_DCT0 30 Loading Loading @@ -1178,8 +1177,6 @@ enum #define HR_MASA_ER_LEVELS 16 #define MAX_REDUCED_NBANDS 18 /* max number of subbands that is less than the default value 24 */ #define LIMIT_ER_ELEVATION_ENC 4 #define LIMIT_ER_SIMPLE_ENC 6 #define LIMIT_USE_COMMON 3 #define MASA_COHERENCE_TOLERANCE 0.1f Loading @@ -1199,12 +1196,6 @@ enum #define MASA_LIMIT_IDX_AVG_AZI 4 #define MASA_NO_POINTS_EQUATOR 430 #define MASA_NO_CIRCLES 121 #define MASA_ASIN_OFFSET 0.0064471690266724975f #define MASA_NTOT2_FAC 32768.00566947353f #define MASA_ANGLE_AT_EQUATOR 0.012894427382667f #define MASA_ANGLE_AT_EQUATOR_DEG 0.738796268264740f #define MASA_INV_ANGLE_AT_EQUATOR_DEG 1.353553128183453f #define MASA_STEREO_MIN_BITRATE IVAS_24k4 #define MAXIMUM_OMASA_FREQ_BANDS 8 /* Corresponds to maximum number of coding bands at 32 kbps */ #define OMASA_STEREO_SW_CNT_MAX 100 Loading lib_com/ivas_masa_com.c +8 −2 Original line number Diff line number Diff line Loading @@ -49,9 +49,15 @@ *---------------------------------------------------------------*/ #define MASA_EXTRA_BAND_META_BITS 40 #define MASA_SMALL_INC_META_BITS 10 #define MASA_NO_CIRCLES 121 #define MASA_ASIN_OFFSET 0.0064471690266724975f #define MASA_NTOT2_FAC 32768.00566947353f #define MASA_ANGLE_AT_EQUATOR 0.012894427382667f #define MASA_ANGLE_AT_EQUATOR_DEG 0.738796268264740f #define MASA_INV_ANGLE_AT_EQUATOR_DEG 1.353553128183453f /*--------------------------------------------------------------- * Local prototypes Loading Loading
lib_com/ivas_cnst.h +0 −9 Original line number Diff line number Diff line Loading @@ -1132,7 +1132,6 @@ enum #define MASA_MAXIMUM_DIRECTIONS 2 #define MASA_MAX_TRANSPORT_CHANNELS 2 #define MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS 5 #define MASA_DELTA_AZI_DCT0 30 Loading Loading @@ -1178,8 +1177,6 @@ enum #define HR_MASA_ER_LEVELS 16 #define MAX_REDUCED_NBANDS 18 /* max number of subbands that is less than the default value 24 */ #define LIMIT_ER_ELEVATION_ENC 4 #define LIMIT_ER_SIMPLE_ENC 6 #define LIMIT_USE_COMMON 3 #define MASA_COHERENCE_TOLERANCE 0.1f Loading @@ -1199,12 +1196,6 @@ enum #define MASA_LIMIT_IDX_AVG_AZI 4 #define MASA_NO_POINTS_EQUATOR 430 #define MASA_NO_CIRCLES 121 #define MASA_ASIN_OFFSET 0.0064471690266724975f #define MASA_NTOT2_FAC 32768.00566947353f #define MASA_ANGLE_AT_EQUATOR 0.012894427382667f #define MASA_ANGLE_AT_EQUATOR_DEG 0.738796268264740f #define MASA_INV_ANGLE_AT_EQUATOR_DEG 1.353553128183453f #define MASA_STEREO_MIN_BITRATE IVAS_24k4 #define MAXIMUM_OMASA_FREQ_BANDS 8 /* Corresponds to maximum number of coding bands at 32 kbps */ #define OMASA_STEREO_SW_CNT_MAX 100 Loading
lib_com/ivas_masa_com.c +8 −2 Original line number Diff line number Diff line Loading @@ -49,9 +49,15 @@ *---------------------------------------------------------------*/ #define MASA_EXTRA_BAND_META_BITS 40 #define MASA_SMALL_INC_META_BITS 10 #define MASA_NO_CIRCLES 121 #define MASA_ASIN_OFFSET 0.0064471690266724975f #define MASA_NTOT2_FAC 32768.00566947353f #define MASA_ANGLE_AT_EQUATOR 0.012894427382667f #define MASA_ANGLE_AT_EQUATOR_DEG 0.738796268264740f #define MASA_INV_ANGLE_AT_EQUATOR_DEG 1.353553128183453f /*--------------------------------------------------------------- * Local prototypes Loading