Merge branch 'main' into 114-new-DTX-test-case-addition (6c7ad8f5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+25 −1

Original line number	Diff line number	Diff line
		@@ -40,13 +40,20 @@
		#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"
		#include "ivas_error_utils.h"
		#ifdef FIX_197_CREND_INTERFACE
		#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H
		#include "lib_rend.h"
		#endif
		#endif

		/* clang-format off */

		@@ -5421,8 +5428,9 @@ ivas_error ivas_crend_process(
		float output[][L_FRAME48k] /* i/o: input/output audio channels */
		);

		#else
		#else /* FIX_197_CREND_INTERFACE */

		#ifndef FIX_197_CREND_INTERFACE_LIB_REND_H
		IVAS_REND_AudioConfigType getAudioConfigType(
		const IVAS_REND_AudioConfig config );

		@@ -5432,19 +5440,30 @@ ivas_error getAudioConfigNumChannels(

		IVAS_REND_AudioConfig getRendAudioConfigFromIvasAudioConfig(
		AUDIO_CONFIG config );
		#endif /* FIX_197_CREND_INTERFACE_LIB_REND_H */

		ivas_error ivas_rend_initCrend(
		CREND_WRAPPER *pCrend,
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		const AUDIO_CONFIG inConfig,
		const AUDIO_CONFIG outConfig,
		#else
		const IVAS_REND_AudioConfig inConfig,
		const IVAS_REND_AudioConfig outConfig,
		#endif
		RENDER_CONFIG_DATA *hRendCfg,
		HRTFS_CREND_HANDLE hSetOfHRTF,
		const int32_t output_Fs );

		ivas_error ivas_rend_openCrend(
		CREND_WRAPPER_HANDLE *pCrend,
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		const AUDIO_CONFIG inConfig,
		const AUDIO_CONFIG outConfig,
		#else
		const IVAS_REND_AudioConfig inConfig,
		const IVAS_REND_AudioConfig outConfig,
		#endif
		RENDER_CONFIG_DATA *hRendCfg,
		int16_t Opt_Headrotation,
		HRTFS_CREND_HANDLE hSetOfHRTF,
		@@ -5459,8 +5478,13 @@ ivas_error ivas_rend_closeCrend(

		ivas_error ivas_rend_crendProcess(
		const CREND_WRAPPER *pCrend,
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		const AUDIO_CONFIG inConfig,
		const AUDIO_CONFIG outConfig,
		#else
		const IVAS_REND_AudioConfig inConfig,
		const IVAS_REND_AudioConfig outConfig,
		#endif
		DECODER_CONFIG_HANDLE hDecoderConfig,
		HEAD_TRACK_DATA_HANDLE hHeadTrackData,
		IVAS_OUTPUT_SETUP_HANDLE hIntSetup,

lib_com/options.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -150,12 +150,17 @@

		#define FIX_197_CREND_INTERFACE

		#ifdef FIX_197_CREND_INTERFACE
		#define FIX_197_CREND_INTERFACE_LIB_REND_H
		#endif

		#define FIX_MEMORY_COUNTING_HRTF_BINARY_FILE
		#define FIX_334_DEBUG_BE_STEREO_SWITCHING /* FhG: Fix non-BE issue for stereo switching when DEBUGGING is enabled */
		#define FIX_198_TDREND_INTERFACE /* Issue 198: Harmonize interface for TD renderer between decoder and external renderer */

		#define DFT_STEREO_SPAR_MIXING
		#ifdef DFT_STEREO_SPAR_MIXING
		#define FIX_345_MSAN_ERROR /* FhG. Fix memory sanitizer error in PLC modes */
		/#define DFT_STEREO_SPAR_MIXING_DEBUG/ /* more debugging output for DFT_STEREO_SPAR_MIXING_DEBUG */
		#define DISABLE_RES_CHANNELS_MCT /* decode only W and residual for Y when outputting to stereo */
		#endif

lib_dec/ivas_dec.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -209,8 +209,13 @@ ivas_error ivas_dec(
		{
		#ifdef FIX_197_CREND_INTERFACE
		if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper,
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		AUDIO_CONFIG_7_1_4,
		AUDIO_CONFIG_BINAURAL_ROOM,
		#else
		IVAS_REND_AUDIO_CONFIG_7_1_4,
		IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM,
		#endif
		NULL,
		NULL,
		NULL,
		@@ -422,8 +427,14 @@ ivas_error ivas_dec(
		{
		#ifdef FIX_197_CREND_INTERFACE
		if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper,
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		st_ivas->intern_config,
		st_ivas->hOutSetup.output_config,
		#else
		getRendAudioConfigFromIvasAudioConfig( st_ivas->intern_config ),
		getRendAudioConfigFromIvasAudioConfig( st_ivas->hOutSetup.output_config ),

		#endif
		st_ivas->hDecoderConfig,
		st_ivas->hHeadTrackData,
		&st_ivas->hIntSetup,

lib_dec/ivas_init_dec.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1249,8 +1249,13 @@ ivas_error ivas_init_decoder(
		}

		if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ),
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		st_ivas->intern_config,
		st_ivas->hDecoderConfig->output_config,
		#else
		getRendAudioConfigFromIvasAudioConfig( st_ivas->intern_config ),
		getRendAudioConfigFromIvasAudioConfig( st_ivas->hDecoderConfig->output_config ),
		#endif
		st_ivas->hRenderConfig, st_ivas->hDecoderConfig->Opt_Headrotation,
		st_ivas->hSetOfHRTF,
		st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

lib_dec/ivas_ism_param_dec.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1087,8 +1087,13 @@ static ivas_error ivas_ism_bitrate_switching(
		/* Open Crend Binaural renderer */
		#ifdef FIX_197_CREND_INTERFACE
		if ( ( error = ivas_rend_openCrend( &( st_ivas->hCrendWrapper ),
		#ifdef FIX_197_CREND_INTERFACE_LIB_REND_H
		st_ivas->intern_config,
		st_ivas->hOutSetup.output_config,
		#else
		getRendAudioConfigFromIvasAudioConfig( st_ivas->intern_config ),
		getRendAudioConfigFromIvasAudioConfig( st_ivas->hOutSetup.output_config ),
		#endif
		st_ivas->hRenderConfig,
		st_ivas->hDecoderConfig->Opt_Headrotation,
		st_ivas->hSetOfHRTF,