Merge branch 'main' into 830-Enable-parallelized-test-runs-in-coverage-test (3c39d830) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1338,7 +1338,7 @@ sanitizer-test-masa:
		- if: $SANITIZER_SCHEDULE_A
		when: delayed
		start_in: 21 hours
		timeout: 3 hours
		timeout: 5 hours
		script:
		- *update-ltv-repo
		- python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS

Workspace_msvc/lib_rend.vcxproj

+2 −4

Original line number	Diff line number	Diff line
		@@ -150,7 +150,6 @@
		<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_MSPred.c" />
		<ClCompile Include="..\lib_rend\ivas_NoiseGen.c" />
		<ClCompile Include="..\lib_rend\ivas_PerceptualModel.c" />
		@@ -195,7 +194,6 @@
		<ClCompile Include="..\lib_rend\lib_rend.c" />
		</ItemGroup>
		<ItemGroup>
		<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" />

Workspace_msvc/lib_rend.vcxproj.filters

+0 −6

Original line number	Diff line number	Diff line
		@@ -5,9 +5,6 @@
		<ClCompile Include="..\lib_rend\ivas_allrad_dec.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_rend\ivas_cldfb_codec_bitstream.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_rend\ivas_crend.c">
		<Filter>rend_c</Filter>
		</ClCompile>
		@@ -206,9 +203,6 @@
		<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

+346 −117

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+2 −16

Original line number	Diff line number	Diff line
		@@ -131,7 +131,6 @@ typedef struct
		const char *ca_config_file;
		bool mimeOutput;
		IVAS_ENC_COMPLEXITY_LEVEL complexityLevel;

		#ifdef DEBUGGING
		IVAS_ENC_FORCED_MODE forcedMode;
		const char *forcedModeFile;
		@@ -178,7 +177,7 @@ int main(
		{
		bool mainFailed = true; /* Assume main failed until cleanup is reached without errors */
		EncArguments arg;
		int16_t i = 0;
		int16_t i;
		ivas_error error = IVAS_ERR_UNKNOWN;

		/* Any handles that require cleanup must be declared here and initialized to NULL */
		@@ -189,11 +188,7 @@ int main(
		FILE *f_bwProfile = NULL;
		JbmFileReader *jbmReader = NULL;
		MasaFileReader *masaReader = NULL;
		IsmFileReader *ismReaders[IVAS_MAX_NUM_OBJECTS];
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		ismReaders[i] = NULL;
		}
		IsmFileReader *ismReaders[IVAS_MAX_NUM_OBJECTS] = { NULL, NULL, NULL, NULL };
		int16_t *pcmBuf = NULL;
		#ifdef DEBUGGING
		FILE *f_forcedModeProfile = NULL;
		@@ -234,7 +229,6 @@ int main(
		goto cleanup;
		}


		/------------------------------------------------------------------------------------------
		* Open output bitstream file
		------------------------------------------------------------------------------------------/
		@@ -492,7 +486,6 @@ int main(
		goto cleanup;
		}


		/* Validate number of channels */
		int16_t encInNumChannels = 0;
		if ( ( error = IVAS_ENC_GetNumInChannels( hIvasEnc, &encInNumChannels ) ) != IVAS_ERR_OK )
		@@ -603,7 +596,6 @@ int main(
		int16_t numSamplesRead = 0;
		uint16_t bitStream[IVAS_MAX_BITS_PER_FRAME];
		uint16_t numBits = 0;

		#ifdef DEBUG_SBA
		#ifdef DEBUG_AGC
		ivas_open_agc_debug_files( (int16_t) arg.agc );
		@@ -725,7 +717,6 @@ int main(
		}
		}
		#endif

		/* Read ISM input metadata */
		for ( i = 0; i < numIsmInputs; ++i )
		{
		@@ -803,7 +794,6 @@ int main(
		#ifdef DEBUGGING
		print_snr();
		#endif

		/------------------------------------------------------------------------------------------
		* Close files and deallocate resources
		------------------------------------------------------------------------------------------/
		@@ -856,7 +846,6 @@ cleanup:
		print_wmops();
		print_mem( NULL );
		#endif

		#ifdef DEBUGGING
		dbgclose();

		@@ -1606,7 +1595,6 @@ static bool parseCmdlIVAS_enc(
		usage_enc();
		}
		}

		else if ( strcmp( to_upper( argv[i] ), "-ISM_SBA" ) == 0 )
		{
		arg->inputFormat = IVAS_ENC_INPUT_SBA_ISM;
		@@ -1695,7 +1683,6 @@ static bool parseCmdlIVAS_enc(
		}
		}
		}

		else if ( strcmp( argv_to_upper, "-STEREO_DMX_EVS" ) == 0 )
		{
		arg->inputFormat = IVAS_ENC_INPUT_MONO;
		@@ -1932,7 +1919,6 @@ static void usage_enc( void )
		fprintf( stdout, "-mime : Mime output bitstream file format\n" );
		fprintf( stdout, " The encoder produces TS26.445 Annex.2.6 Mime Storage Format, (not RFC4867 Mime Format).\n" );
		fprintf( stdout, " default output bitstream file format is G.192\n" );

		fprintf( stdout, "-bypass mode : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1\n" );
		fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );
		fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );