Merge from 109-harmonize-head-and-orientation-tracking. (3cf0d186) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+24 −2

Original line number	Diff line number	Diff line
		@@ -1444,15 +1444,24 @@ static ivas_error initOnFirstGoodFrame(
		/* If outputting MASA, open output file and write metadata for initial bad frames */
		else if ( *pBsFormat == IVAS_DEC_BS_MASA )
		{
		#ifdef FIX_350_MASA_DELAY_COMP
		if ( ( error = MasaFileWriter_open( arg.outputWavFilename, arg.delayCompensationEnabled, ppMasaWriter ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_open( arg.outputWavFilename, ppMasaWriter ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError: Error opening MASA decoded metadata file %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
		return error;
		}

		/* Duplicate good first frame metadata to fill the beginning of stream. */
		#ifdef FIX_350_MASA_DELAY_COMP
		MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#else
		IVAS_MASA_QMETADATA_HANDLE qMetadata = NULL;
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &qMetadata ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		return error;
		@@ -1460,7 +1469,11 @@ static ivas_error initOnFirstGoodFrame(

		for ( int16_t j = 0; j < numInitialBadFrames; ++j )
		{
		#ifdef FIX_350_MASA_DELAY_COMP
		if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, qMetadata ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
		return error;
		@@ -1745,14 +1758,23 @@ static ivas_error decodeG192(
		}
		else if ( bsFormat == IVAS_DEC_BS_MASA )
		{
		#ifdef FIX_350_MASA_DELAY_COMP
		MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#else
		IVAS_MASA_QMETADATA_HANDLE qMetadata;
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &qMetadata ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef FIX_350_MASA_DELAY_COMP
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, qMetadata ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		goto cleanup;
		@@ -1772,8 +1794,8 @@ static ivas_error decodeG192(
		#endif
		}
		#ifdef WMOPS
		update_wmops();
		update_mem();
		update_wmops();
		#endif
		}

		@@ -2273,8 +2295,8 @@ static ivas_error decodeVoIP(
		systemTime_ms += 20;

		#ifdef WMOPS
		update_wmops();
		update_mem();
		update_wmops();
		#endif
		}

apps/encoder.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -778,8 +778,8 @@ int main(
		}

		#ifdef WMOPS
		update_wmops();
		update_mem();
		update_wmops();
		#endif
		}

apps/renderer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1173,8 +1173,8 @@ int main(
		}

		#ifdef WMOPS
		update_wmops();
		update_mem();
		update_wmops();
		#endif
		}

lib_com/cldfb.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -706,8 +706,7 @@ ivas_error openCldfb(
		HANDLE_CLDFB_FILTER_BANK hs;
		int16_t buf_len;

		hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) );
		if ( hs == NULL )
		if ( ( hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
		}
		@@ -728,8 +727,7 @@ ivas_error openCldfb(
		buf_len = hs->p_filter_length;
		}

		hs->cldfb_state = (float ) malloc( buf_len sizeof( float ) );
		if ( hs->cldfb_state == NULL )
		if ( ( hs->cldfb_state = (float ) malloc( buf_len sizeof( float ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
		}
		@@ -1148,8 +1146,7 @@ ivas_error cldfb_save_memory(
		hs->memory_length = hs->p_filter_length;
		}

		hs->memory = (float ) malloc( hs->memory_length sizeof( float ) );
		if ( hs->memory == NULL )
		if ( ( hs->memory = (float ) malloc( hs->memory_length sizeof( float ) ) ) == NULL )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB\n" );
		}

lib_com/common_api_types.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -94,7 +94,11 @@ typedef struct
		#endif /* OTR_REFERENCE_VECTOR_TRACKING */

		typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;
		#ifdef FIX_350_MASA_DELAY_COMP
		typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE;
		#else
		typedef struct ivas_masa_qmetadata_frame_struct *IVAS_MASA_QMETADATA_HANDLE;
		#endif

		typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;
		typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;