revision of constants and includes (c902c9dd) · Commits · SA4 / Audio / IVAS BASOP

apps/renderer.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,8 @@ static
		* Local structures
		------------------------------------------------------------------------------------------/

		typedef float IVAS_REND_LfePanMtx[RENDERER_MAX_INPUT_LFE_CHANNELS][RENDERER_MAX_OUTPUT_CHANNELS];

		typedef struct
		{
		uint32_t frameCounter;

lib_com/cnst.h

+569 −937

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ivas_agc_com_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,13 +32,13 @@

		#include <stdint.h>
		#include "options.h"
		#include "cnst.h"
		#include "ivas_cnst.h"
		#include "ivas_prot_fx.h"
		#include <math.h>
		#include "wmc_auto.h"
		#include "prot_fx.h"
		#include "rom_com.h"


		/------------------------------------------------------------------------------------------
		* Local constants
		------------------------------------------------------------------------------------------/

lib_com/ivas_cnst.h

+121 −11

Original line number	Diff line number	Diff line
		@@ -204,8 +204,6 @@ typedef enum
		#define EDIT_GAIN_MAX_Q12 16306 /* Maximum allowed object gain edit in Q12: 3.9810719f, +12 dB */
		#endif



		typedef enum
		{
		TC_BUFFER_MODE_RENDERER,
		@@ -646,9 +644,6 @@ typedef enum
		#define SBA_DIRAC_NRG_SMOOTH_LONG 10
		#define SBA_DIRAC_NRG_SMOOTH_SHORT 3

		#define SBA_DIRAC_NRG_SMOOTH_SHORT_BY_LONG_FX ((Word16)0x2667)
		#define SBA_DIRAC_NRG_SMOOTH_LONG_BY_LONG_SHORT_FX ((Word32)0x5B6DB6DB)

		/* PLC for DFT Stereo residual */
		#define STEREO_DFT_RES_N_PEAKS_MAX 15 /Maximum number of peaks within residual signal in each frame (res_cod_band_max == 6 in 48kHz)/

		@@ -819,7 +814,6 @@ enum fea_names
		#define STEREO_BITS_ICBWE_DFT ( STEREO_ICBWE_SPBITS_DFT + STEREO_ICBWE_GSBITS_DFT + STEREO_ICBWE_REFBITS )

		#define MAX_DELAYREGLEN 12 /* max regression length */
		#define INV_MAX_DELAYREGLEN 0.083333333333333f /* (1/MAX_DELAYREGLEN) */
		#define INV_MAX_DELAYREGLEN_FX_Q15 2731 /* (1/MAX_DELAYREGLEN) in Q15 */
		#define MAX_INTERPOLATE 11
		#define ADDED_MEM_DS 40
		@@ -1278,8 +1272,7 @@ enum
		#define MASA_INV_ANGLE_AT_EQUATOR_DEG_Q30 1453366656l /* 1.353553128183453f in Q30 */

		#define MASA_JBM_RINGBUFFER_FRAMES 3
		#define TOLERANCE_360_Q22 1510033326 /* 360 in Q22 + 0.02 in Q22*/
		#define MINUS_TOLERANCE_360_Q22 -1510033326 /* - (360 in Q22 + 0.02 in Q22) */

		typedef enum
		{
		MASA_STEREO_NOT_DEFINED,
		@@ -1366,6 +1359,13 @@ typedef enum

		#define MCT_NUM_BLOCK_DATA_BITS 4

		typedef enum
		{
		MCT_CHAN_MODE_REGULAR,
		MCT_CHAN_MODE_LFE,
		MCT_CHAN_MODE_IGNORE
		} MCT_CHAN_MODE;


		/----------------------------------------------------------------------------------
		* MC Param-Upmix Mode Constants
		@@ -1543,6 +1543,10 @@ typedef enum

		#define VBAP_NUM_SEARCH_SECTORS 4

		#define DEGREE_90_Q_22 377487360
		#define DEGREE_180_Q_22 754974720
		#define DEGREE_360_Q_22 1509949440


		/----------------------------------------------------------------------------------
		* Binaural Rendering Constants
		@@ -1852,6 +1856,112 @@ typedef enum

		} STEREO_DMX_EVS_PRC;


		/----------------------------------------------------------------------------------
		* Q values
		----------------------------------------------------------------------------------/

		#define Q1 1
		#define Q2 2
		#define Q3 3
		#define Q4 4
		#define Q5 5
		#define Q6 6
		#define Q7 7
		#define Q8 8
		#define Q9 9
		#define Q10 10
		#define Q11 11
		#define Q12 12
		#define Q13 13
		#define Q14 14
		#define Q15 15
		#define Q16 16
		#define Q17 17
		#define Q18 18
		#define Q19 19
		#define Q20 20
		#define Q21 21
		#define Q22 22
		#define Q23 23
		#define Q24 24
		#define Q25 25
		#define Q26 26
		#define Q27 27
		#define Q28 28
		#define Q29 29
		#define Q30 30
		#define Q31 31

		/----------------------------------------------------------------------------------
		* One (1) in Q
		----------------------------------------------------------------------------------/

		#define ONE_IN_Q1 2
		#define ONE_IN_Q2 4
		#define ONE_IN_Q3 8
		#define ONE_IN_Q4 16
		#define ONE_IN_Q5 32
		#define ONE_IN_Q6 64
		#define ONE_IN_Q7 128
		#define ONE_IN_Q8 256
		#define ONE_IN_Q9 512
		#define ONE_IN_Q10 1024
		#define ONE_IN_Q11 2048
		#define ONE_IN_Q12 4096
		#define ONE_IN_Q13 8192
		#define ONE_IN_Q14 16384
		#define ONE_IN_Q15 32768
		#define ONE_IN_Q16 65536
		#define ONE_IN_Q17 131072
		#define ONE_IN_Q18 262144
		#define ONE_IN_Q19 524288
		#define ONE_IN_Q20 1048576
		#define ONE_IN_Q21 2097152
		#define ONE_IN_Q22 4194304
		#define ONE_IN_Q23 8388608
		#define ONE_IN_Q24 16777216
		#define ONE_IN_Q25 33554432
		#define ONE_IN_Q26 67108864
		#define ONE_IN_Q27 134217728
		#define ONE_IN_Q28 268435456
		#define ONE_IN_Q29 536870912
		#define ONE_IN_Q30 1073741824
		#define ONE_IN_Q31 0x7fffffff
		#define ONE_IN_Q45 (Word64)0x200000000000
		#define ONE_IN_Q62 (Word64)0x4000000000000000

		#define MAX_WORD16 32767

		/----------------------------------------------------------------------------------
		* General constants
		----------------------------------------------------------------------------------/

		#define L_SUBFRAME_48k 240
		#define L_SUBFRAME_32k 160
		#define L_SUBFRAME_16k 80
		#define L_SUBFRAME_8k 40

		#define Q31_BY_SUB_FRAME_240 8985287 /* 1/239 in Q31 */
		#define Q31_BY_SUB_FRAME_160 13506186 /* 1/159 in Q31 */
		#define Q31_BY_SUB_FRAME_80 27183337 /* 1/79 in Q31 */
		#define Q31_BY_SUB_FRAME_40 55063683 /* 1/39 in Q31 */

		#define EVS_PI_FX 25736 /* pi in Q13 */
		#define EVS_2PI_FX 51472 /* 2 * pi in Q13 */
		#define EVS_PI_FX_Q27 421657428 /* pi in Q28 */
		#define EVS_2PI_FX_Q27 843314856 /* 2 * pi in Q28 */
		#define EVS_PI_BY_2_FX (Word16)(0x3244)/* Q13 */


		#define FS_48K_IN_NS_Q31 103079
		#define FS_32K_IN_NS_Q31 68719
		#define FS_16K_IN_NS_Q31 34360

		#define ONE_BY_THREE_Q15 10923 /* 1/3.f in Q15 */
		#define ONE_BY_TEN_Q15 3277 /* 1/10.f in Q15 */
		#define THREE_Q21 6291456

		#endif
		/* clang-format on */
		/* IVAS_CNST_H */

lib_com/ivas_cov_smooth_fx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@

		#include <stdint.h>
		#include "options.h"
		#include "cnst.h"
		#include "ivas_cnst.h"
		#include "wmc_auto.h"
		#include "prot_fx.h"
		#include "ivas_prot_fx.h"