Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec (eb7954cd) · Commits · IVAS Codec Public Collaboration / IVAS Codec

CMakeLists.txt

+4 −3

Original line number	Diff line number	Diff line
		@@ -172,15 +172,16 @@ if(NOT INCLUDE_SPLIT)
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.lc3plus.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_cldfb_codec.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.splitRend.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_CQMF.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.splitrenderer.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_lcld.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_Pred.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_RMSEnv.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_PerceptualModel.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_lcld_tables.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_lcld_rom_tables.*\.c$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.lc3plus.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.splitRend.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.ivas_cldfb_codec.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.ivas_lcld_tables.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.ivas_lcld_rom_tables.*\.h$")
		endif()

		if(INCLUDE_SPLIT)

Workspace_msvc/lib_rend.vcxproj

+8 −14

Original line number	Diff line number	Diff line
		@@ -145,12 +145,12 @@
		<ClCompile Include="..\lib_rend\ivas_lc3plus_common.c" />
		<ClCompile Include="..\lib_rend\ivas_lc3plus_dec.c" />
		<ClCompile Include="..\lib_rend\ivas_lc3plus_enc.c" />
		<ClCompile Include="..\lib_rend\ivas_lcld_tables.c" />
		<ClCompile Include="..\lib_rend\ivas_lcld_decoder.c" />
		<ClCompile Include="..\lib_rend\ivas_lcld_encoder.c" />
		<ClCompile Include="..\lib_rend\ivas_lcld_rom_tables.c" />
		<ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />
		<ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />
		<ClCompile Include="..\lib_rend\ivas_cldfb_codec_bitstream.c" />
		<ClCompile Include="..\lib_rend\ivas_CQMFDecoder.c" />
		<ClCompile Include="..\lib_rend\ivas_CQMFEncoder.c" />
		<ClCompile Include="..\lib_rend\ivas_MSPred.c" />
		<ClCompile Include="..\lib_rend\ivas_NoiseGen.c" />
		<ClCompile Include="..\lib_rend\ivas_PerceptualModel.c" />
		@@ -195,16 +195,10 @@
		<ClCompile Include="..\lib_rend\lib_rend.c" />
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_rend\ivas_CQMFDecoder.h" />
		<ClInclude Include="..\lib_rend\ivas_CQMFEncoder.h" />
		<ClInclude Include="..\lib_rend\ivas_lcld_tables.h" />
		<ClInclude Include="..\lib_rend\ivas_MSPred.h" />
		<ClInclude Include="..\lib_rend\ivas_NoiseGen.h" />
		<ClInclude Include="..\lib_rend\ivas_PerceptualModel.h" />
		<ClInclude Include="..\lib_rend\ivas_PredDecoder.h" />
		<ClInclude Include="..\lib_rend\ivas_PredEncoder.h" />
		<ClInclude Include="..\lib_rend\ivas_cldfb_codec_bitstream.h" />
		<ClInclude Include="..\lib_rend\ivas_lcld_prot.h" />
		<ClInclude Include="..\lib_rend\ivas_lcld_rom_tables.h" />
		<ClInclude Include="..\lib_rend\ivas_prot_rend.h" />
		<ClInclude Include="..\lib_rend\ivas_RMSEnvGrouping.h" />
		<ClInclude Include="..\lib_rend\ivas_rom_binauralRenderer.h" />
		<ClInclude Include="..\lib_rend\ivas_rom_binaural_crend_head.h" />
		<ClInclude Include="..\lib_rend\ivas_rom_rend.h" />

Workspace_msvc/lib_rend.vcxproj.filters

+18 −12

Original line number	Diff line number	Diff line
		@@ -155,15 +155,21 @@
		<ClCompile Include="..\lib_rend\ivas_splitRendererPre.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_rend\ivas_lcld_tables.c" />
		<ClCompile Include="..\lib_rend\ivas_CQMFDecoder.c" />
		<ClCompile Include="..\lib_rend\ivas_CQMFEncoder.c" />
		<ClCompile Include="..\lib_rend\ivas_shoebox.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_rend\ivas_reflections.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_rend\ivas_lcld_rom_tables.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_rend\ivas_lcld_decoder.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_rend\ivas_lcld_encoder.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_rend\lib_rend.h" />
		@@ -194,15 +200,15 @@
		<ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h">
		<Filter>rend_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_rend\ivas_CQMFDecoder.h" />
		<ClInclude Include="..\lib_rend\ivas_CQMFEncoder.h" />
		<ClInclude Include="..\lib_rend\ivas_lcld_tables.h" />
		<ClInclude Include="..\lib_rend\ivas_MSPred.h" />
		<ClInclude Include="..\lib_rend\ivas_NoiseGen.h" />
		<ClInclude Include="..\lib_rend\ivas_PerceptualModel.h" />
		<ClInclude Include="..\lib_rend\ivas_PredDecoder.h" />
		<ClInclude Include="..\lib_rend\ivas_PredEncoder.h" />
		<ClInclude Include="..\lib_rend\ivas_RMSEnvGrouping.h" />
		<ClInclude Include="..\lib_rend\ivas_lcld_prot.h">
		<Filter>rend_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_rend\ivas_lcld_rom_tables.h">
		<Filter>rend_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_rend\ivas_cldfb_codec_bitstream.h">
		<Filter>rend_h</Filter>
		</ClInclude>
		</ItemGroup>
		<ItemGroup>
		<Filter Include="rend_h">

apps/decoder.c

+97 −138

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+10 −46

Original line number	Diff line number	Diff line
		@@ -88,16 +88,13 @@ typedef union _EncInputFormatConfig
		/* MC details */
		IVAS_ENC_MC_LAYOUT mcLayout;

		#ifdef MASA_AND_OBJECTS
		struct EncMasaIsmConfig
		{
		int16_t numObjects;
		const char *metadataFiles[IVAS_MAX_NUM_OBJECTS];
		IVAS_ENC_MASA_VARIANT masaVariant;
		} masa_ism;
		#endif

		#ifdef SBA_AND_OBJECTS
		struct EncSbaIsmConfig
		{
		int16_t numObjects;
		@@ -105,7 +102,6 @@ typedef union _EncInputFormatConfig
		IVAS_ENC_SBA_ORDER order;
		bool isPlanar;
		} sba_ism;
		#endif

		} EncInputFormatConfig;

		@@ -255,11 +251,7 @@ int main(
		* Print out file names
		------------------------------------------------------------------------------------------/

		#ifdef SBA_AND_OBJECTS
		if ( arg.inputFormat == IVAS_ENC_INPUT_ISM \|\| arg.inputFormat == IVAS_ENC_INPUT_SBA_ISM )
		#else
		if ( arg.inputFormat == IVAS_ENC_INPUT_ISM )
		#endif
		{
		for ( i = 0; i < arg.inputFormatConfig.ism.numObjects; i++ )
		{
		@@ -454,7 +446,6 @@ int main(
		}
		break;

		#ifdef SBA_AND_OBJECTS
		case IVAS_ENC_INPUT_SBA_ISM:
		if ( ( error = IVAS_ENC_ConfigureForSBAObjects( hIvasEnc, arg.inputFs, totalBitrate, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba_ism.numObjects, arg.inputFormatConfig.sba_ism.order, arg.inputFormatConfig.sba_ism.isPlanar, arg.pca ) ) != IVAS_ERR_OK )
		{
		@@ -462,9 +453,7 @@ int main(
		exit( -1 );
		}
		break;
		#endif

		#ifdef MASA_AND_OBJECTS
		case IVAS_ENC_INPUT_MASA_ISM:
		if ( ( error = IVAS_ENC_ConfigureForMASAObjects( hIvasEnc, arg.inputFs, totalBitrate, bandwidth, arg.dtxConfig, arg.inputFormatConfig.masa_ism.numObjects, arg.inputFormatConfig.masa_ism.masaVariant ) ) != IVAS_ERR_OK )
		{
		@@ -472,7 +461,6 @@ int main(
		exit( -1 );
		}
		break;
		#endif

		default:
		fprintf( stderr, "\nInvalid input type\n\n" );
		@@ -558,17 +546,9 @@ int main(
		}
		}

		#ifdef MASA_AND_OBJECTS
		const int16_t numIsmInputs = ( arg.inputFormat == IVAS_ENC_INPUT_ISM \|\| arg.inputFormat == IVAS_ENC_INPUT_MASA_ISM
		#ifdef SBA_AND_OBJECTS
		\|\| arg.inputFormat == IVAS_ENC_INPUT_SBA_ISM
		#endif
		)
		const int16_t numIsmInputs = ( arg.inputFormat == IVAS_ENC_INPUT_ISM \|\| arg.inputFormat == IVAS_ENC_INPUT_MASA_ISM \|\| arg.inputFormat == IVAS_ENC_INPUT_SBA_ISM )
		? arg.inputFormatConfig.ism.numObjects
		: 0;
		#else
		const int16_t numIsmInputs = arg.inputFormat == IVAS_ENC_INPUT_ISM ? arg.inputFormatConfig.ism.numObjects : 0;
		#endif

		for ( i = 0; i < numIsmInputs; ++i )
		{
		@@ -1547,7 +1527,6 @@ static bool parseCmdlIVAS_enc(
		return false;
		}
		}
		#ifdef MASA_AND_OBJECTS
		else if ( strcmp( to_upper( argv[i] ), "-ISM_MASA" ) == 0 )
		{
		arg->inputFormat = IVAS_ENC_INPUT_MASA_ISM;
		@@ -1640,9 +1619,7 @@ static bool parseCmdlIVAS_enc(
		usage_enc();
		}
		}
		#endif

		#ifdef SBA_AND_OBJECTS
		else if ( strcmp( to_upper( argv[i] ), "-ISM_SBA" ) == 0 )
		{
		arg->inputFormat = IVAS_ENC_INPUT_SBA_ISM;
		@@ -1731,7 +1708,6 @@ static bool parseCmdlIVAS_enc(
		}
		}
		}
		#endif

		else if ( strcmp( argv_to_upper, "-STEREO_DMX_EVS" ) == 0 )
		{
		@@ -1912,16 +1888,8 @@ static void usage_enc( void )
		fprintf( stdout, " for 2 ISM, 3 ISM and 4 ISM also 160000, 192000, 256000) \n" );
		fprintf( stdout, " for 3 ISM and 4 ISM also 384000 \n" );
		fprintf( stdout, " for 4 ISM also 512000 \n" );
		fprintf( stdout, " for IVAS SBA, MASA, MC R=(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" );
		fprintf( stdout, " 96000, 128000, 160000, 192000, 256000, 384000, 512000) \n" );
		#ifdef SBA_AND_OBJECTS
		fprintf( stdout, " for IVAS objects-SBA R =(13200, 16400, 24400, 32000, 48000, 64000, 96000, 128000, \n" );
		fprintf( stdout, " 160000, 192000, 256000, 384000, 512000)\n" );
		#endif
		#ifdef MASA_AND_OBJECTS
		fprintf( stdout, " for IVAS objects-MASA R =(13200, 16400, 24400, 32000, 48000, 64000, 96000, 128000, \n" );
		fprintf( stdout, " 160000, 192000, 256000, 384000, 512000)\n" );
		#endif
		fprintf( stdout, " for IVAS SBA, MASA, MC, ISM-SBA, and ISM-MASA R=(13200, 16400, 24400, 32000, 48000, 64000,\n" );
		fprintf( stdout, " 80000, 96000, 128000, 160000, 192000, 256000, 384000, 512000) \n" );
		fprintf( stdout, " Alternatively, R can be a bitrate switching file which consists of R values\n" );
		fprintf( stdout, " indicating the bitrate for each frame in bps. These values are stored in\n" );
		fprintf( stdout, " binary format using 4 bytes per value\n" );
		@@ -1932,7 +1900,7 @@ static void usage_enc( void )

		fprintf( stdout, "Options:\n" );
		fprintf( stdout, "--------\n" );
		fprintf( stdout, "EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc\n" );
		fprintf( stdout, "EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc, -ism_sba, -ism_masa\n" );
		fprintf( stdout, "-stereo : Stereo format \n" );
		fprintf( stdout, "-ism (+)Ch Files : ISM format \n" );
		fprintf( stdout, " where Ch specifies the number of ISMs (1-4)\n" );
		@@ -1945,19 +1913,15 @@ static void usage_enc( void )
		fprintf( stdout, "-masa Ch File : MASA format \n" );
		fprintf( stdout, " where Ch specifies the number of MASA input/transport channels (1 or 2): \n" );
		fprintf( stdout, " and File specifies input file containing parametric MASA metadata \n" );
		#ifdef SBA_AND_OBJECTS
		fprintf( stdout, "-ism_sba IsmChannels SBAorder IsmFiles : SBA and ISM format \n" );
		fprintf( stdout, " where IsmChannels specifies the number of ISms (1-4)\n" );
		fprintf( stdout, " and SBAorder specifies the SBA order (1 to 3) \n" );
		fprintf( stdout, " and IsmFiles specify input files containing metadata, one file per object \n" );
		#endif
		#ifdef MASA_AND_OBJECTS
		fprintf( stdout, "-ism_masa IsmCh MasaCh IsmFiles MasaFile : MASA and ISM format \n" );
		fprintf( stdout, "-ism_sba IsmCh +/-Order IsmFiles : SBA and ISM combined format\n" );
		fprintf( stdout, " where IsmCh specifies the number of ISMs (1-4)\n" );
		fprintf( stdout, " and Order specifies the SBA order (1 to 3) \n" );
		fprintf( stdout, " and IsmFiles specify input files containing ISM metadata, one file per object \n" );
		fprintf( stdout, "-ism_masa IsmCh MasaCh IsmFiles MasaFile : MASA and ISM combined format \n" );
		fprintf( stdout, " where IsmCh specifies the number of ISMs (1-4),\n" );
		fprintf( stdout, " MasaCh specifies the number of MASA input/transport channels (1-2), \n" );
		fprintf( stdout, " IsmFiles specify input files containing metadata, one file per object, \n" );
		fprintf( stdout, " IsmFiles specify input files containing ISM metadata, one file per object, \n" );
		fprintf( stdout, " and MasaFile specifies input file containing parametric MASA metadata \n" );
		#endif
		fprintf( stdout, "-mc InputConf : Multi-channel format\n" );
		fprintf( stdout, " where InputConf specifies the channel configuration: 5_1, 7_1, 5_1_2, 5_1_4, 7_1_4\n" );
		fprintf( stdout, " Loudspeaker positions are assumed to have azimuth and elevation as per \n" );

Original line number	Diff line number	Diff line
		@@ -172,15 +172,16 @@ if(NOT INCLUDE_SPLIT)
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.lc3plus.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_cldfb_codec.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.splitRend.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_CQMF.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.splitrenderer.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_lcld.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_Pred.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_RMSEnv.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_PerceptualModel.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_lcld_tables.*\.c$")
		list(FILTER libRendSrcs EXCLUDE REGEX ".lib_rend\/.ivas_lcld_rom_tables.*\.c$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.lc3plus.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.splitRend.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.ivas_cldfb_codec.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.ivas_lcld_tables.*\.h$")
		list(FILTER libRendHeaders EXCLUDE REGEX ".lib_rend\/.ivas_lcld_rom_tables.*\.h$")
		endif()

		if(INCLUDE_SPLIT)