Simplify preprocessor logic around FIX_197_CREND_INTERFACE switch (f823842a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_stat_dec.h

+3 −7

Original line number	Diff line number	Diff line
		@@ -40,10 +40,7 @@
		#include "ivas_cnst.h"
		#include "ivas_stat_com.h"
		#include "ivas_stat_rend.h"
		#if !defined( FIX_197_CREND_INTERFACE ) \|\| defined( FIX_197_CREND_INTERFACE )
		#include "common_api_types.h" // VE2AT: don't we want to avoid this include in the library? I admit that the rules hefre are not 100% clear to me but introducing it just for IVAS_QUATERNION is not necessry I think
		#endif
		#if !defined( FIX_197_CREND_INTERFACE ) \|\| defined( FIX_197_CREND_INTERFACE )
		/----------------------------------------------------------------------------------
		* Output configuration for renderer (e.g. DirAC, MASA, Binaural Renderer...)
		----------------------------------------------------------------------------------/
		@@ -69,7 +66,6 @@ typedef struct ivas_output_setup_structure

		} IVAS_OUTPUT_SETUP, *IVAS_OUTPUT_SETUP_HANDLE;

		#endif
		#endif
		/----------------------------------------------------------------------------------
		* DFT Stereo decoder structure
		@@ -821,7 +817,7 @@ typedef struct ivas_spar_md_dec_state_t
		int16_t spar_hoa_md_flag;
		} ivas_spar_md_dec_state_t;

		#if ( !defined( FIX_197_CREND_INTERFACE ) \|\| defined( FIX_197_CREND_INTERFACE ) ) && defined( FIX_197_CREND_INTERFACE_LIB_REND_H )
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

		/* AGC structure */
		typedef struct ivas_agc_dec_chan_state_t
		@@ -994,7 +990,7 @@ typedef struct mct_dec_data_structure

		} MCT_DEC_DATA, *MCT_DEC_HANDLE;

		#if ( !defined( FIX_197_CREND_INTERFACE ) \|\| defined( FIX_197_CREND_INTERFACE ) ) && defined( FIX_197_CREND_INTERFACE_LIB_REND_H )
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

		/----------------------------------------------------------------------------------
		* EFAP structures
		@@ -1183,7 +1179,7 @@ typedef struct ivas_masa_decoder_struct

		} MASA_DECODER, *MASA_DECODER_HANDLE;

		#if ( !defined( FIX_197_CREND_INTERFACE ) \|\| defined( FIX_197_CREND_INTERFACE ) ) && defined( FIX_197_CREND_INTERFACE_LIB_REND_H )
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

		/----------------------------------------------------------------------------------
		* Binaural Rendering structure

lib_rend/ivas_stat_rend.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ typedef struct
		float lfeOutputGains[IVAS_MAX_INPUT_LFE_CHANNELS][IVAS_MAX_OUTPUT_CHANNELS];
		} IVAS_REND_LfeRouting;

		#if ( defined( FIX_197_CREND_INTERFACE ) \|\| !defined( FIX_197_CREND_INTERFACE ) ) && defined( FIX_197_CREND_INTERFACE_LIB_REND_H )
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

		typedef struct
		{
		@@ -1120,7 +1120,7 @@ typedef struct decoder_config_structure

		} DECODER_CONFIG, *DECODER_CONFIG_HANDLE;

		#if ( defined( FIX_197_CREND_INTERFACE ) \|\| !defined( FIX_197_CREND_INTERFACE ) ) && defined( FIX_197_CREND_INTERFACE_LIB_REND_H )
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

		typedef struct
		{

lib_rend/lib_rend.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@
		#define RENDERER_MAX_SBA_INPUTS 1
		#define RENDERER_MAX_MASA_INPUTS 1

		#if ( defined( FIX_197_CREND_INTERFACE ) \|\| !defined( FIX_197_CREND_INTERFACE ) ) && defined( FIX_197_CREND_INTERFACE_LIB_REND_H )
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

		#define RENDERER_HEAD_POSITIONS_PER_FRAME 4