updated branch to newer 38 version (71110610) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/lib_rend.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -198,7 +198,6 @@
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\lib_rend\ivas_reflections.c" />
		<ClCompile Include="..\lib_rend\ivas_reflections_utils.c" />
		<ClCompile Include="..\lib_rend\ivas_shoebox.c" />
		<ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions.c" />
		<ClCompile Include="..\lib_rend\ivas_hrtf.c" />
		@@ -253,7 +252,6 @@
		<ClCompile Include="..\lib_rend\lib_rend.c" />
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_rend\ivas_er_utils.h" />
		<ClInclude Include="..\lib_rend\ivas_lcld_tables.h" />
		<ClInclude Include="..\lib_rend\ivas_PerceptualModel.h" />
		<ClInclude Include="..\lib_rend\ivas_prot_rend.h" />

lib_com/ivas_cnst.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -1848,7 +1848,6 @@ typedef enum
		* Early Reflection constants
		----------------------------------------------------------------------------------/
		#define ER_ABS_COEFF 6
		#define ER_MAX_BANDS 1
		#define ER_MAX_SOURCES 25
		#define ER_REF_ORDER 1
		#define ER_NUM_REF 6
		@@ -1856,8 +1855,7 @@ typedef enum
		#define ER_AIR_COEFF (0.00137f)
		#define ER_SOUND_SPEED (343.0f)
		#define ER_MIN_WALL_DIST (0.1f)

		#define ER_IS_Z_HEIGHT 1
		#define ER_EUCLIDEAN_SCALE (1.29246971E-26f)

		#define ER_DEFAULT_ROOM_L (3.0f)
		#define ER_DEFAULT_ROOM_W (4.0f)

lib_com/ivas_dirac_com.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -111,12 +111,20 @@ ivas_error ivas_dirac_config(
		if ( ( (Encoder_Struct *) st_ivas )->hSpar != NULL )
		{
		hFbMdft = ( (Encoder_Struct *) st_ivas )->hSpar->hFbMixer;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}
		else
		{
		hFbMdft = NULL;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = NULL;
		#endif
		}
		#ifndef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Encoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}
		else
		{
		@@ -131,13 +139,21 @@ ivas_error ivas_dirac_config(
		if ( ( (Decoder_Struct *) st_ivas )->hSpar != NULL )
		{
		hFbMdft = ( (Decoder_Struct *) st_ivas )->hSpar->hFbMixer;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}
		else
		{
		hFbMdft = NULL;
		#ifdef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = NULL;
		#endif
		}
		( (Decoder_Struct *) st_ivas )->hDirAC->hFbMdft = hFbMdft;
		#ifndef FIX_613_DIRAC_NULL_PTR_USAN
		dirac_to_spar_md_bands = ( (Decoder_Struct *) st_ivas )->hSpar->dirac_to_spar_md_bands;
		#endif
		}

		if ( ivas_format == SBA_FORMAT )

lib_com/ivas_prot.h

+24 −0

Original line number	Diff line number	Diff line
		@@ -4252,6 +4252,10 @@ void ivas_sba_mix_matrix_determiner(
		const int16_t bfi, /* i : BFI flag */
		const int16_t nchan_remapped, /* i : num channels after remapping of TCs */
		const int16_t output_frame /* i : output frame length */
		#ifdef VLBR_20MS_MD
		,
		const int16_t num_md_sub_frames /* i : number of subframes in mixing matrix */
		#endif
		);

		/* AGC */
		@@ -4554,7 +4558,23 @@ void ivas_get_spar_md_from_dirac(
		int16_t ivas_get_spar_dec_md_num_subframes(
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		#ifdef VLBR_20MS_MD
		,
		const int32_t ivas_last_active_brate /* i : IVAS last active bitrate */
		#endif
		);
		#ifdef VLBR_20MS_MD

		ivas_error ivas_spar_md_dec_matrix_open(
		ivas_spar_md_dec_state_t hMdDec, / i/o: SPAR MD decoder handle */
		const int16_t num_channels, /* i : number of internal channels */
		const int16_t num_md_sub_frames );

		void ivas_spar_md_dec_matrix_close(
		ivas_spar_md_dec_state_t hMdDecoder, / i/o: SPAR MD decoder handle */
		const int16_t num_channels ); /* i : number of internal channels */

		#endif

		ivas_error ivas_spar_md_dec_open(
		ivas_spar_md_dec_state_t *hMdDec_out, / i/o: SPAR MD decoder handle */
		@@ -4562,6 +4582,10 @@ ivas_error ivas_spar_md_dec_open(
		const int16_t num_channels, /* i : number of internal channels */
		const int16_t sba_order, /* i : SBA order */
		const int16_t sid_format /* i : SID format */
		#ifdef VLBR_20MS_MD
		,
		const int32_t last_active_ivas_total_brate /* i : IVAS last active bitrate */
		#endif
		);

		void ivas_spar_md_dec_close(

lib_com/ivas_spar_com.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1766,7 +1766,11 @@ void ivas_get_spar_md_from_dirac(
		{
		for ( band = start_band; band < end_band; band++ )
		{
		#ifdef FIX_615_UBSAN_SPAR_TO_DIRAC
		ndm = hSpar_md_cfg->num_dmx_chans_per_band[band];
		#else
		ndm = hSpar_md_cfg->num_dmx_chans_per_band[band - 1];
		#endif

		/SPAR from DirAC/
		set_f( response_avg, 0.0f, MAX_OUTPUT_CHANNELS );