fix issue 880: Functions renaming after NONBE_UNIFIED_DECODING_PATHS; under... (f26508e8) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+45 −2

Original line number	Diff line number	Diff line
		@@ -310,6 +310,25 @@ void stereo_dmx_evs_close_encoder(
		STEREO_DMX_EVS_ENC_HANDLE hStereoDmxEVS / i/o: Stereo downmix for EVS encoder handle */
		);

		#ifdef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		ivas_error ivas_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float data / o : output synthesis signals */
		);

		ivas_error ivas_dec_render(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const uint16_t nSamplesAsked, /* i : number of samples wanted */
		uint16_t nSamplesRendered, / o : number of samples rendered */
		uint16_t nSamplesAvailableNext, / o : number of samples still available in the rendering pipeline */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		const PCM_RESOLUTION pcm_resolution, /* i : type for the decoded PCM resolution */
		void data / o : output synthesis signal */
		#else
		int16_t data / o : output synthesis signal */
		#endif
		);
		#else
		ivas_error ivas_dec(
		Decoder_Struct st_ivas, / i : IVAS decoder structure */
		#if( defined SPLIT_REND_WITH_HEAD_ROT && !defined NONBE_UNIFIED_DECODING_PATHS_FIX )
		@@ -319,6 +338,7 @@ ivas_error ivas_dec(
		int16_t data / o : output synthesis signal */
		#endif
		);
		#endif

		ivas_error ivas_dec_setup(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		@@ -784,6 +804,7 @@ void ivas_apply_non_diegetic_panning(
		* JBM prototypes
		----------------------------------------------------------------------------------/

		#ifndef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		ivas_error ivas_jbm_dec_tc(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float data / o : output synthesis signals */
		@@ -801,7 +822,7 @@ ivas_error ivas_jbm_dec_render(
		int16_t data / o : output synthesis signal */
		#endif
		);

		#endif
		ivas_error ivas_jbm_dec_flush_renderer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const int16_t tc_granularity_new, /* i : new renderer granularity */
		@@ -5216,6 +5237,13 @@ void ivas_spar_param_to_masa_param_mapping(
		const int16_t subframe /* i : Subframe to map */
		);

		#ifdef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		void ivas_dec_copy_masa_meta_to_buffer(
		JBM_METADATA_HANDLE hJbmMetadata, /* o : metadata handle for buffering in JBM */
		MASA_DECODER_EXT_OUT_META extOutMeta / i : MASA external output metadata */
		);

		#endif

		/---------------------------------------------------------------------------------
		* Binaural FastConv Renderer Prototypes
		@@ -5693,7 +5721,11 @@ ivas_error ivas_osba_data_open(
		Decoder_Struct st_ivas / i/o: IVAS decoder handle */
		);

		#ifdef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		ivas_error ivas_osba_dirac_td_binaural(
		#else
		ivas_error ivas_osba_dirac_td_binaural_jbm(
		#endif
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const uint16_t nSamplesAsked, /* i : number of CLDFB slots requested */
		uint16_t nSamplesRendered, / o : number of CLDFB slots rendered */
		@@ -5876,7 +5908,11 @@ ivas_error ivas_omasa_dirac_td_binaural(
		const int16_t output_frame /* i : output frame length per channel */
		);
		#endif
		#ifdef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		ivas_error ivas_omasa_dirac_td_binaural(
		#else
		ivas_error ivas_omasa_dirac_td_binaural_jbm(
		#endif
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamplesAsked, /* i : number of samples requested */
		uint16_t nSamplesRendered, / o : number of samples rendered */
		@@ -5899,7 +5935,11 @@ void ivas_omasa_rearrange_channels(
		const int16_t output_frame /* i : output frame length per channel */
		);

		#ifdef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		void ivas_omasa_dirac_rend(
		#else
		void ivas_omasa_dirac_rend_jbm(
		#endif
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		const uint16_t nSamplesAsked, /* i : number of samples requested */
		uint16_t nSamplesRendered, / o : number of samples rendered */
		@@ -5931,9 +5971,12 @@ void ivas_omasa_separate_object_render(
		float output_f[], / i/o: output signals */
		const int16_t output_frame /* i : output frame length per channel */
		);

		#endif
		#ifdef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		void ivas_omasa_separate_object_render(
		#else
		void ivas_omasa_separate_object_render_jbm(
		#endif
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		const uint16_t nSamplesRendered, /* i : number of samples rendered */
		#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@
		#define NONBE_UNIFIED_DECODING_PATHS /* FhG: unify decoding paths */
		#ifdef NONBE_UNIFIED_DECODING_PATHS
		#define NONBE_UNIFIED_DECODING_PATHS_FIX /* VA: issue 876: fixes within NONBE_UNIFIED_DECODING_PATHS */
		#define UNIFIED_DECODING_PATHS_FUNCTION_NAMES /* VA: issue 880: Functions renaming after NONBE_UNIFIED_DECODING_PATHS */
		#endif
		#define NONBE_FIX_874_OMASA_BRSW_2TD /* Nokia: issue 874: Fixes the crashes with the long test vectors that prompted switching to TD*/
		#define NONBE_FIX_871_ACELP_CRASH_IN_OSBA /* FhG: isse 871: crash in ACELP core encoder with OSBA */

lib_dec/ivas_dec.c

+1526 −464

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_dirac_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1691,7 +1691,7 @@ void ivas_dirac_dec_render(
		SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
		float *output_f_local[MAX_OUTPUT_CHANNELS];
		#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX
		float output_f_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k]; // VE2SB: TBV
		float output_f_local_buff[MAX_OUTPUT_CHANNELS][L_FRAME48k];
		#endif

		hSpatParamRendCom = st_ivas->hSpatParamRendCom;

lib_dec/ivas_init_dec.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2269,8 +2269,10 @@ ivas_error ivas_init_decoder(
		}
		}

		#ifndef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		if ( st_ivas->hJbmMetadata == NULL )
		{
		#endif
		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		if ( ( error = ivas_jbm_dec_metadata_open( st_ivas ) ) != IVAS_ERR_OK )
		@@ -2278,7 +2280,9 @@ ivas_error ivas_init_decoder(
		return error;
		}
		}
		#ifndef UNIFIED_DECODING_PATHS_FUNCTION_NAMES
		}
		#endif

		/-----------------------------------------------------------------
		* Allocate floating-point output audio buffers