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

apps/decoder.c

+0 −32

Original line number	Diff line number	Diff line
		@@ -1990,12 +1990,8 @@ static ivas_error initOnFirstGoodFrame(

		for ( int16_t j = 0; j < numInitialBadFrames; ++j )
		{
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		float delayMs = (float) ( pFullDelayNumSamples[0] ) / (float) ( *delayTimeScale );
		if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
		return error;
		@@ -2301,11 +2297,7 @@ static ivas_error decodeG192(
		{
		if ( ( error = TsmScaleFileReader_readScale( tsmScaleFileReader, &scale ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_699_FILE_READER_JBM_TSM
		fprintf( stderr, "\nError (%s) when reading TSM data from %s \n\n", arg.inputBitstreamFilename, TsmScaleFileReader_getFilePath( tsmScaleFileReader ) );
		#else
		fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename );
		#endif
		goto cleanup;
		}
		int16_t maxScaling;
		@@ -2505,7 +2497,6 @@ static ivas_error decodeG192(
		if ( bsFormat == IVAS_DEC_BS_MASA \|\| bsFormat == IVAS_DEC_BS_MASA_ISM )
		{
		IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		int16_t fullDelayNumSamples[3];
		float delayMs;

		@@ -2514,19 +2505,14 @@ static ivas_error decodeG192(
		{
		fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
		}
		#endif
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		goto cleanup;
		@@ -2661,7 +2647,6 @@ static ivas_error decodeG192(
		if ( bsFormat == IVAS_DEC_BS_MASA \|\| bsFormat == IVAS_DEC_BS_MASA_ISM )
		{
		IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		int16_t fullDelayNumSamples[3];
		float delayMs;

		@@ -2669,19 +2654,14 @@ static ivas_error decodeG192(
		{
		fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
		}
		#endif
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		goto cleanup;
		@@ -3356,7 +3336,6 @@ static ivas_error decodeVoIP(
		if ( bsFormat == IVAS_DEC_BS_MASA \|\| bsFormat == IVAS_DEC_BS_MASA_ISM )
		{
		IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		int16_t fullDelayNumSamples[3];
		float delayMs;

		@@ -3365,19 +3344,14 @@ static ivas_error decodeVoIP(
		{
		fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
		}
		#endif
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 1 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		goto cleanup;
		@@ -3463,7 +3437,6 @@ static ivas_error decodeVoIP(
		if ( bsFormat == IVAS_DEC_BS_MASA \|\| bsFormat == IVAS_DEC_BS_MASA_ISM )
		{
		IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		int16_t fullDelayNumSamples[3];
		float delayMs;

		@@ -3472,19 +3445,14 @@ static ivas_error decodeVoIP(
		{
		fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
		}
		#endif
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		goto cleanup;

apps/encoder.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -686,11 +686,7 @@ int main(
		{
		if ( ( error = JbmFileReader_readCAconfig( jbmReader, &caConfig ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_699_FILE_READER_JBM_TSM
		fprintf( stderr, "\nError (%s) while reading Channel-Aware Config. from: %s\n\n", IVAS_ENC_GetErrorMessage( error ), JbmFileReader_getFilePath( jbmReader ) );
		#else
		fprintf( stderr, "JbmFileReader_readCAconfig() failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		#endif
		goto cleanup;
		}

apps/renderer.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -2110,11 +2110,7 @@ int main(
		}
		}

		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMetaOutput, NULL ) ) != IVAS_ERR_OK ) /* NULL -> use default metadata delay settings */
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMetaOutput ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		}

lib_com/ari_hm.c

+1 −13

Original line number	Diff line number	Diff line
		@@ -205,11 +205,7 @@ int16_t CountIndexBits(
		-------------------------------------------------------------------/

		int16_t tcx_hm_render(
		#ifdef FIX_1001_ARI_HM_OVERFLOW
		const int32_t lag, /* i : pitch lag */
		#else
		const int16_t lag, /* i : pitch lag */
		#endif
		const int16_t fract_res, /* i : fractional resolution of the lag */
		Word16 p[] /* o : harmonic model (Q13) */
		)
		@@ -269,22 +265,14 @@ int16_t tcx_hm_render(

		void tcx_hm_modify_envelope(
		const Word16 gain, /* i : HM gain (Q11) */
		#ifdef FIX_1001_ARI_HM_OVERFLOW
		const int32_t lag,
		#else
		const int16_t lag,
		#endif
		const int16_t fract_res,
		const Word16 p[], /* i : harmonic model (Q13) */
		Word32 env[], /* i/o: envelope (Q16) */
		const int16_t L_frame /* i : number of spectral lines */
		)
		{
		#ifdef FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI
		int32_t h, x, k;
		#else
		int16_t k, h, x;
		#endif
		Word16 inv_shape[2 * kTcxHmParabolaHalfWidth + 1]; /* Q15 */

		if ( gain == 0 )

lib_com/ivas_cnst.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -118,13 +118,9 @@ typedef enum
		RENDERER_NON_DIEGETIC_DOWNMIX,
		RENDERER_OSBA_STEREO,
		RENDERER_OSBA_AMBI,
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		RENDERER_OSBA_LS,
		RENDERER_OMASA_OBJECT_EXT,
		RENDERER_OMASA_MIX_EXT
		#else
		RENDERER_OSBA_LS
		#endif
		} RENDERER_TYPE;

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		@@ -1390,17 +1386,9 @@ typedef enum
		#define PARAM_MC_ICC_ERROR_BIAS_FAC (1.15f) /* factor for favouring past ICC maps in the adaptive ICC map decision */
		#define PARAM_MC_TRANSIENT_BAND_STEP 2 /* Number of parameter bands combined in case of a transient frame*/
		#define PARAM_MC_MAX_DECORR_CLDFB_BANDS 20 /* Maximum number of CLDFB bands with decorrelation */
		#ifdef FIX_901_PARAMMC_DEAD_CODE
		#define PARAM_MC_MAX_TRANSPORT_CHANS 3 /* Number of down mix channels */
		#else
		#define PARAM_MC_MAX_TRANSPORT_CHANS 4 /* Number of down mix channels */
		#endif
		#define PARAM_MC_MAX_ILD_REF_CHANNELS 2 /* Maximum number of reference channels for a coded ILD */
		#ifdef FIX_901_PARAMMC_DEAD_CODE
		#define PARAM_MC_NUM_CONFIGS 14 /* Number of available Parametric MC configurations */
		#else
		#define PARAM_MC_NUM_CONFIGS 15 /* Number of available Parametric MC configurations */
		#endif
		#define PARAM_MC_MAX_BAND_LFE 1 /* Number of parameter bands for LFE coding */
		#define PARAM_MC_SZ_ICC_MAP 11 /* Maximum number of transmitted ICCs per parameter band */
		#define PARAM_MC_SZ_ILD_MAP 12 /* Maximum number of transmitted channel energies per band*/