Merge remote-tracking branch 'origin/main' into... (1f5635d1) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -564,12 +564,27 @@ static void setupWithSingleFormatInput(
		positionProvider->numObjects = args.inConfig.numAudioObjects;
		for ( int16_t i = 0; i < positionProvider->numObjects; ++i )
		{
		#ifdef FIX_1376_MISSING_ISM_METADATA
		/* Check if path to metadata file was given */
		if ( isEmptyString( args.inMetadataFilePaths[i] ) )
		{
		fprintf( stderr, "No metadata file was given for ISM input %d\n", i );
		exit( -1 );
		}

		/* It is allowed on CLI to have no metadata for an ISM input - skip opening if string contains "NULL" */
		#else
		/* It is allowed on CLI to have no metadata for an ISM input - skip opening if string is empty or contains "NULL" */
		#endif
		char charBuf[FILENAME_MAX];
		strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 );
		charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0';
		to_upper( charBuf );
		#ifdef FIX_1376_MISSING_ISM_METADATA
		if ( strncmp( charBuf, "NULL", 4 ) == 0 )
		#else
		if ( isEmptyString( args.inMetadataFilePaths[i] ) \|\| strncmp( charBuf, "NULL", 4 ) == 0 )
		#endif
		{
		continue;
		}
		@@ -2595,7 +2610,11 @@ static CmdlnArgs defaultArgs(
		args.outConfig.outSetupCustom.num_lfe = 0;
		args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;

		#ifdef FIX_1376_MISSING_ISM_METADATA
		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )
		#else
		for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
		#endif
		{
		clearString( args.inMetadataFilePaths[i] );
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,9 @@ typedef enum
		IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,
		IVAS_ERR_NO_FILE_OPEN,
		IVAS_ERR_SAMPLING_RATE_UNKNOWN,
		#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK
		IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT,
		#endif

		/----------------------------------------
		* renderer (lib_rend only) *
		@@ -271,6 +274,10 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
		return "Invalid input format";
		case IVAS_ERR_INVALID_INDEX:
		return "Invalid index";
		#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK
		case IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT:
		return "Euler angles were detected in the input but only Quaternions are supported";
		#endif
		default:
		break;
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -308,8 +308,14 @@ ivas_error ivas_init_decoder(

		ivas_error ivas_output_buff_dec(
		float p_output_f[], / i/o: output audio buffers */
		#ifdef FIX_1330_JBM_MEMORY
		const int16_t nchan_out_buff, /* i : number of output channels */
		const int16_t Opt_tsm, /* i : TSM option flag */
		DECODER_TC_BUFFER_HANDLE hTcBuffer /* i : TSM buffer handle */
		#else
		const int16_t nchan_out_buff_old, /* i : previous frame number of output channels*/
		const int16_t nchan_out_buff /* i : number of output channels */
		#endif
		);

		ivas_error stereo_dmx_evs_init_encoder(
		@@ -5823,8 +5829,12 @@ void ivas_omasa_separate_object_render_jbm(
		const uint16_t nSamplesRendered, /* i : number of samples rendered */
		float input_f[][L_FRAME48k], /* i : separated object signal */
		float output_f[], / o : rendered time signal */
		#ifdef FIX_1330_JBM_MEMORY
		const int16_t subframes_rendered /* i : number of subframes rendered */
		#else
		const int16_t subframes_rendered, /* i : number of subframes rendered */
		const int16_t slots_rendered /* i : number of CLDFB slots rendered */
		#endif
		);

		void ivas_omasa_encode_masa_to_total(

+12 −0

Original line number	Diff line number	Diff line
		@@ -198,12 +198,24 @@ void ivas_buffer_deinterleaved_to_interleaved(
		)
		{
		int16_t ch, m;
		#ifdef FIX_1330_JBM_MEMORY
		float buffer[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k]; /* temp buffer needed when "audio[]" and "audio_out[]" are the same */

		for ( ch = 0; ch < n_channels; ch++ )
		{
		mvr2r( audio[ch], buffer[ch], frame_length );
		}
		#endif

		for ( ch = 0; ch < n_channels; ch++ )
		{
		for ( m = 0; m < frame_length; m++ )
		{
		#ifdef FIX_1330_JBM_MEMORY
		audio_out[m * n_channels + ch] = buffer[ch][m];
		#else
		audio_out[m * n_channels + ch] = audio[ch][m];
		#endif
		}
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,9 @@
		#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
		#define FIX_1348_OVERFLOW /* FhG: fix BASOP overflow in hq_lr_dec(), brings floating-point code inline with FX */
		#define FIX_1369_HQ_LR_OVERFLOW /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */
		#define FIX_1376_MISSING_ISM_METADATA /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */
		#define FIX_1330_JBM_MEMORY /* VA: issue 1330: memory savings in the JBM decoder */
		#define FIX_1370_EXTERNAL_ORIENTATION_CHECK /* Nokia: add sanity check for Euler angles for external orientations */
		#define FIX_1371_EARLY_PART_INIT_FASTCONV /* Nokia: fix uninitialized variable in FASTCONV path of binaural reverb init */

		/* #################### End BE switches ################################## */
		@@ -178,6 +181,7 @@
		#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR. */
		#define NONBE_SVD_OPTIMIZATION

		#define NONBE_1328_FIX_NON_LINEARITY /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0 */
		/* ##################### End NON-BE switches ########################### */

		/* ################## End DEVELOPMENT switches ######################### */