Merge branch 'main' into 365-improved-sba-to-mono-output (bf91d872) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+44 −14

Original line number	Diff line number	Diff line
		@@ -267,19 +267,50 @@ int main(
		/------------------------------------------------------------------------------------------
		* Open reference rotation file
		------------------------------------------------------------------------------------------/

		if ( arg.enableReferenceRotation )
		{
		/* sanity check */
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		{
		fprintf( stderr, "\nError: Reference rotation file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		}

		/* sanity check */
		if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF )
		{
		fprintf( stderr, "\nError: Reference rotation file can be used in '-otr ref' mode only.\n\n" );
		goto cleanup;
		}

		if ( ( error = HeadRotationFileReader_open( arg.refrotTrajFileName, &refRotReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Can't open reference rotation file %s \n\n", arg.refrotTrajFileName );
		goto cleanup;
		}
		}

		/------------------------------------------------------------------------------------------
		* Open reference vector trajectory file
		------------------------------------------------------------------------------------------/

		if ( arg.enableReferenceVectorTracking )
		{
		/* sanity check */
		if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
		{
		fprintf( stderr, "\nError: Reference vector trajectory file cannot be used in this output configuration.\n\n" );
		goto cleanup;
		}

		/* sanity check */
		if ( arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC && arg.orientation_tracking != IVAS_PUBLIC_ORIENT_TRK_REF_VEC_LEV )
		{
		fprintf( stderr, "\nError: Reference trajectory file can be used in '-otr ref_vec' or '-otr ref_vec_lev' mode only.\n\n" );
		goto cleanup;
		}

		if ( ( error = Vector3PairFileReader_open( arg.referenceVectorTrajFileName, &referenceVectorReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Can't open reference vector trajectory file %s \n\n", arg.referenceVectorTrajFileName );
		@@ -873,9 +904,7 @@ static bool parseCmdlIVAS_dec(
		}
		#ifdef DEBUG_MODE_INFO
		#ifdef DEBUG_MODE_INFO_TWEAK
		/-----------------------------------------------------------------
		* Define additional subfolder for debug info output in ./res
		-----------------------------------------------------------------/
		/* Define additional subfolder for debug info output in ./res */
		else if ( strcmp( argv_to_upper, "-INFO" ) == 0 )
		{
		extern char infoFolder[FILENAME_MAX];
		@@ -1153,8 +1182,19 @@ static void usage_dec( void )
		fprintf( stdout, " Format files, the magic word in the mime file is used to determine\n" );
		fprintf( stdout, " which of the two supported formats is in use.\n" );
		fprintf( stdout, " default bitstream file format is G.192\n" );
		fprintf( stdout, "-T File : Head rotation specified by external trajectory File\n" );
		fprintf( stdout, "-hrtf File : HRTF filter File used in BINAURAL output configuration\n" );
		fprintf( stdout, "-T File : Head rotation specified by external trajectory File\n" );
		fprintf( stdout, "-otr tracking_type : Head orientation tracking type: 'none', 'ref', 'avg', 'ref_vec' \n" );
		fprintf( stdout, " or 'ref_vec_lev' (only for binaural rendering)\n" );
		fprintf( stdout, "-rf File : Reference rotation specified by external trajectory file\n" );
		fprintf( stdout, " works only in combination with '-otr ref' mode \n" );
		fprintf( stdout, "-rvf File : Reference vector specified by external trajectory file\n" );
		fprintf( stdout, " works only in combination with '-otr ref_vec' and 'ref_vec_lev' modes\n" );
		fprintf( stdout, "-render_config File : Renderer configuration File\n" );
		fprintf( stdout, "-no_diegetic_pan : panning mono non-diegetic sound to stereo -1<= pan <=1,\n" );
		fprintf( stdout, " left or l or 1->left, right or r or -1->right, center or c or 0->middle\n" );
		fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
		fprintf( stdout, " default is deactivated\n" );
		#ifdef DEBUGGING
		fprintf( stdout, "-FEC X : Insert frame erasures, X = 0-10 is the percentage\n" );
		fprintf( stdout, " of erased frames, or X may be the name of binary file or \n" );
		@@ -1163,16 +1203,6 @@ static void usage_dec( void )
		fprintf( stdout, " default is OFF, if this option is not used\n" );
		fprintf( stdout, "-force R : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),\n" );
		#endif
		fprintf( stdout, "-otr tracking_type : head orientation tracking type: 'none', 'ref' or 'avg' (only for binaural rendering)\n" );
		fprintf( stdout, "-rf File : Reference rotation specified by external trajectory file\n" );
		fprintf( stdout, " works only in combination with -otr ref mode\n" );
		fprintf( stdout, "-rvf File : Reference vector specified by external trajectory file\n" );
		fprintf( stdout, " works only in combination with -otr ref_vec and ref_vec_lev modes\n" );
		fprintf( stdout, "-render_config file : Renderer configuration file\n" );
		fprintf( stdout, "-no_diegetic_pan : panning mono no dietic sound to stereo -1<= pan <=1,\n" );
		fprintf( stdout, " left or l or 1->left, right or r or -1->right, center or c or 0->middle\n" );
		fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
		fprintf( stdout, " default is deactivated\n" );
		#ifdef DEBUG_MODE_INFO
		#ifdef DEBUG_MODE_INFO_TWEAK
		fprintf( stdout, "-info <folder> : specify subfolder name for debug output\n" );

lib_com/ivas_masa_com.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -314,7 +314,7 @@ void masa_sample_rate_band_correction(
		int16_t band_mapping, / i/o: Band mapping used and modified */
		IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */
		const int32_t sampling_rate /* i : Sampling rate */
		#ifdef FIX_373_MASA_DELAY_COMP
		#ifdef FIX_350_MASA_DELAY_COMP
		,
		MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */
		#endif
		@@ -390,7 +390,7 @@ void masa_sample_rate_band_correction(
		hQMetaData->twoDirBands[band] = 0;
		}
		}
		#ifdef FIX_373_MASA_DELAY_COMP
		#ifdef FIX_350_MASA_DELAY_COMP
		if ( hExtOutMeta != NULL )
		{
		/* in decoder, zero the EXT out MASA meta buffer */

lib_com/ivas_prot.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -4628,7 +4628,7 @@ void masa_sample_rate_band_correction(
		int16_t band_mapping, / i/o: Band mapping used and modified */
		IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: QMetadata structure for modification */
		const int32_t sampling_rate /* i : sampling rate */
		#ifdef FIX_373_MASA_DELAY_COMP
		#ifdef FIX_350_MASA_DELAY_COMP
		, MASA_DECODER_EXT_OUT_META_HANDLE hExtOutMeta /* i/o: MASA decoder metadata ext out buffer */
		#endif
		);

lib_com/options.h

100755 → 100644

+1 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,7 @@
		#define DISABLE_ADAP_RES_COD_TMP /* temporary fix for IVAS-403, disables adaptive residual coding */
		/#define ITD_WINNER_GAIN_MODIFY / /* ITD optimization - WORK IN PROGRESS */
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define FIX_103_RA_PARAMS_PARAM_BIN_REND /* Issue 103: Digest room acoustics parameters for Parametric Binaural Renderer*/
		/#define SBA_HPF_TUNING_DEC/

		#define FIX_350_MASA_DELAY_COMP /* Nokia: Issue 350: MASA audio/meta delay compensation */

lib_dec/ivas_masa_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -501,7 +501,7 @@ static ivas_error ivas_masa_dec_config(

		ivas_set_qmetadata_maxbit_req( st_ivas->hQMetaData, st_ivas->ivas_format );

		#ifdef FIX_373_MASA_DELAY_COMP
		#ifdef FIX_350_MASA_DELAY_COMP
		if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )
		{
		/* need to apply the sampling rate correction also for the EXT output MASA meta buffer */