version merged with main (dad7dc85) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+17 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,11 @@
		#include "stat_enc.h"
		#include "stat_dec.h"
		#include "stat_com.h"
		#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H
		#ifdef FIX_197_CREND_INTERFACE
		#include "ivas_stat_rend.h"
		#endif
		#endif
		#include "ivas_stat_enc.h"
		#include "ivas_stat_dec.h"
		#include "ivas_stat_com.h"
		@@ -5413,6 +5418,18 @@ ivas_error ivas_crend_process(

		#else

		#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H
		IVAS_REND_AudioConfigType getAudioConfigType(
		const IVAS_REND_AudioConfig config );

		ivas_error getAudioConfigNumChannels(
		const IVAS_REND_AudioConfig config,
		int16_t *numChannels );

		IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig(
		AUDIO_CONFIG config );
		#endif

		ivas_error ivas_rend_initCrend(
		CREND_WRAPPER *pCrend,
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

lib_dec/ivas_stat_dec.h

+19 −2

Original line number	Diff line number	Diff line
		@@ -40,12 +40,16 @@
		#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...)
		----------------------------------------------------------------------------------/

		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H

		typedef struct ivas_output_setup_structure
		{
		AUDIO_CONFIG output_config;
		@@ -65,7 +69,8 @@ typedef struct ivas_output_setup_structure

		} IVAS_OUTPUT_SETUP, *IVAS_OUTPUT_SETUP_HANDLE;


		#endif
		#endif
		/----------------------------------------------------------------------------------
		* DFT Stereo decoder structure
		----------------------------------------------------------------------------------/
		@@ -816,6 +821,8 @@ 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 )

		/* AGC structure */
		typedef struct ivas_agc_dec_chan_state_t
		{
		@@ -854,6 +861,8 @@ typedef struct ivas_td_decorr_state_t

		} ivas_td_decorr_state_t;

		#endif

		/* PCA structure */
		typedef struct
		{
		@@ -985,6 +994,8 @@ 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 )

		/----------------------------------------------------------------------------------
		* EFAP structures
		----------------------------------------------------------------------------------/
		@@ -1117,6 +1128,7 @@ typedef struct renderer_struct

		} ISM_RENDERER_DATA, *ISM_RENDERER_HANDLE;

		#endif
		/----------------------------------------------------------------------------------
		* MASA decoder structures
		----------------------------------------------------------------------------------/
		@@ -1171,6 +1183,8 @@ 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 )

		/----------------------------------------------------------------------------------
		* Binaural Rendering structure
		----------------------------------------------------------------------------------/
		@@ -1807,6 +1821,7 @@ typedef struct ivas_hrtfs_file_header_t

		#endif

		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		#ifdef FIX_197_CREND_INTERFACE
		/* Main Crend wrapper structure */
		typedef struct ivas_binaural_crend_wrapper_struct
		@@ -1816,6 +1831,7 @@ typedef struct ivas_binaural_crend_wrapper_struct
		HRTFS_HANDLE hHrtfCrend;
		} CREND_WRAPPER, *CREND_WRAPPER_HANDLE;
		#endif
		#endif

		/----------------------------------------------------------------------------------
		* LFE decoder structure
		@@ -1886,6 +1902,7 @@ typedef struct decoder_config_structure

		} DECODER_CONFIG, *DECODER_CONFIG_HANDLE;

		#endif
		/----------------------------------------------------------------------------------
		*
		* Main IVAS decoder structure

lib_rend/ivas_crend.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -36,14 +36,23 @@
		#include "ivas_prot.h"
		#include "ivas_cnst.h"
		#include "ivas_rom_rend.h"
		#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H
		#include "ivas_stat_dec.h"
		#endif
		#include <math.h>
		#include "ivas_rom_binaural_crend_head.h"
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		#include "lib_rend.h"
		#include "ivas_lib_rend_internal.h"
		#else
		#ifdef FIX_197_CREND_INTERFACE
		#include "ivas_stat_rend.h"
		#endif
		#include "lib_rend.h"
		#else
		#include "lib_rend.h"
		#include "ivas_lib_rend_internal.h"
		#endif
		#endif
		#ifdef DEBUGGING
		#include "debug.h"
		#endif

lib_rend/ivas_lib_rend_internal.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -31,9 +31,19 @@
		*******************************************************************************************************/

		#include "ivas_error.h"
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		#ifndef FIX_197_CREND_INTERFACE
		#include "lib_rend.h"
		#include "ivas_stat_dec.h"
		#endif
		#else
		#ifdef FIX_197_CREND_INTERFACE
		#include "ivas_stat_rend.h"
		#else
		#include "lib_rend.h"
		#endif
		#include "ivas_stat_dec.h"

		#endif

		#ifndef IVAS_LIB_REND_INTERNALS_H

lib_rend/ivas_stat_rend.h

+1096 −0

File changed.

Preview size limit exceeded, changes collapsed.