Merge branch 'ivas-float-update' into... (c10a2118) · Commits · SA4 / Audio / IVAS BASOP

Workspace_msvc/lib_lc3plus.vcxproj

+9 −8

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@
		<ClCompile Include="..\lib_lc3plus\attack_detector.c" />
		<ClCompile Include="..\lib_lc3plus\plc_compute_stab_fac.c" />
		<ClCompile Include="..\lib_lc3plus\constants.c" />
		<ClCompile Include="..\lib_lc3plus\com_entropy.c" />
		<ClCompile Include="..\lib_lc3plus\cutoff_bandwidth.c" />
		<ClCompile Include="..\lib_lc3plus\dct4.c" />
		<ClCompile Include="..\lib_lc3plus\dec_entropy.c" />
		@@ -116,7 +117,7 @@
		<ClCompile Include="..\lib_lc3plus\estimate_global_gain.c" />
		<ClCompile Include="..\lib_lc3plus\lc3plus_fft.c" />
		<ClCompile Include="..\lib_lc3plus\imdct.c" />
		<ClCompile Include="..\lib_lc3plus\lc3.c" />
		<ClCompile Include="..\lib_lc3plus\lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\ltpf_coder.c" />
		<ClCompile Include="..\lib_lc3plus\ltpf_decoder.c" />
		<ClCompile Include="..\lib_lc3plus\mdct.c" />
		@@ -153,9 +154,9 @@
		<ClCompile Include="..\lib_lc3plus\resamp12k8.c" />
		<ClCompile Include="..\lib_lc3plus\residual_coding.c" />
		<ClCompile Include="..\lib_lc3plus\residual_decoding.c" />
		<ClCompile Include="..\lib_lc3plus\setup_dec_lc3.c" />
		<ClCompile Include="..\lib_lc3plus\setup_enc_lc3.c" />
		<ClCompile Include="..\lib_lc3plus\setup_com_lc3.c" />
		<ClCompile Include="..\lib_lc3plus\setup_dec_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\setup_enc_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\setup_com_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\sns_compute_scf.c" />
		<ClCompile Include="..\lib_lc3plus\sns_interpolate_scf.c" />
		<ClCompile Include="..\lib_lc3plus\sns_quantize_scf.c" />
		@@ -169,9 +170,9 @@
		<ClInclude Include="..\lib_lc3plus\defines.h" />
		<ClInclude Include="..\lib_lc3plus\file_io.h" />
		<ClInclude Include="..\lib_lc3plus\functions.h" />
		<ClInclude Include="..\lib_lc3plus\lc3.h" />
		<ClInclude Include="..\lib_lc3plus\setup_dec_lc3.h" />
		<ClInclude Include="..\lib_lc3plus\setup_enc_lc3.h" />
		<ClInclude Include="..\lib_lc3plus\lc3plus.h" />
		<ClInclude Include="..\lib_lc3plus\setup_dec_lc3plus.h" />
		<ClInclude Include="..\lib_lc3plus\setup_enc_lc3plus.h" />
		<ClInclude Include="..\lib_lc3plus\structs.h" />
		<ClInclude Include="..\lib_lc3plus\tinywavein_c.h" />
		<ClInclude Include="..\lib_lc3plus\tinywaveout_c.h" />

Workspace_msvc/lib_rend.vcxproj

+2 −0

Original line number	Diff line number	Diff line
		@@ -138,6 +138,7 @@
		</Lib>
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\lib_rend\ivas_cldfb_ring_buffer.c" />
		<ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec.c" />
		<ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions.c" />
		<ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec.c" />
		@@ -175,6 +176,7 @@
		<ClCompile Include="..\lib_rend\ivas_rom_rend.c" />
		<ClCompile Include="..\lib_rend\ivas_shoebox.c" />
		<ClCompile Include="..\lib_rend\ivas_td_decorr.c" />
		<ClCompile Include="..\lib_rend\ivas_td_ring_buffer.c" />
		<ClCompile Include="..\lib_rend\ivas_vbap.c" />
		<ClCompile Include="..\lib_rend\lib_rend.c" />
		</ItemGroup>

Workspace_msvc/lib_rend.vcxproj.filters

+3 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,9 @@
		<ClCompile Include="..\lib_rend\ivas_td_decorr.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_rend\ivas_cldfb_ring_buffer.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_rend\lib_rend.h" />

apps/decoder.c

+137 −142

File changed.

Preview size limit exceeded, changes collapsed.

apps/isar_post_rend.c

+13 −18

Original line number	Diff line number	Diff line
		@@ -953,9 +953,7 @@ int main(

		while ( 1 )
		{
		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		int16_t bfi = 0;
		#endif
		int16_t num_in_channels;
		num_in_channels = inBuffer.config.numChannels;

		@@ -964,11 +962,7 @@ int main(
		{
		ivas_error error_tmp;
		numSamplesRead = (int16_t) inBufferSize;
		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		error_tmp = split_rend_read_bits_from_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten, &bfi );
		#else
		error_tmp = split_rend_read_bits_from_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten );
		#endif
		if ( error_tmp != IVAS_ERR_OK )
		{
		if ( error_tmp == IVAS_ERR_END_OF_FILE )
		@@ -1035,23 +1029,12 @@ int main(
		/* Read from split renderer bfi file if specified */
		if ( splitRendBFIReader != NULL && splitBinNeedsNewFrame )
		{
		#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST
		int16_t bfi;
		#endif
		if ( ( error = SplitRendBFIFileReading( splitRendBFIReader, &bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		#endif
		}
		#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST
		if ( splitBinNeedsNewFrame )
		{
		if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )
		@@ -1060,7 +1043,6 @@ int main(
		goto cleanup;
		}
		}
		#endif

		for ( i = 0; i < args.inConfig.numBinBuses; ++i )
		{
		@@ -1086,6 +1068,19 @@ int main(
		fprintf( stderr, "\nISAR_POST_REND_FeedSplitBinauralBitstream failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		/* Set BFI if frame is empty */
		int16_t frameEmpty = (int16_t) ( bitsBuffer.config.bitsWritten == 0 );
		if ( frameEmpty )
		{
		if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, 1 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		#endif
		}
		}