Resolve merge conflicts. (2d0fff42) · Commits · SA4 / Audio / IVAS BASOP

.clang-format

+9 −0

Original line number	Diff line number	Diff line
		@@ -84,5 +84,14 @@ SpacesInCStyleCastParentheses: false
		SpacesInParentheses: true
		SpacesInSquareBrackets: false
		Standard: Cpp11
		StatementMacros:
		- IF
		# - ELSE IF
		# - ELSE # Note that ELSE cannot be used here as it would break ELSE IF into two lines.
		- SWITCH
		- CASE
		- FOR
		- WHILE
		- DO
		TabWidth: 8
		UseTab: Never

apps/decoder.c

+100 −24

Original line number	Diff line number	Diff line
		@@ -159,14 +159,11 @@ typedef struct

		static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );
		static void usage_dec( void );
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE phIvasDec, int16_t *pcmBuf );
		#else
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t pcmBuf );
		#endif
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE phIvasDec, int16_t *pcmBuf );
		static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );
		static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS editableParameters, ObjectEditFileReader objectEditFileReader );
		static ivas_error updateOnFormatSwitching( IVAS_DEC_HANDLE hIvasDec, IVAS_DEC_BS_FORMAT pBsFormat, const char outputWavFilename, MasaFileWriter *ppMasaWriter, IsmFileWriter ismWriters[IVAS_MAX_NUM_OBJECTS], int16_t pNumOutChannels, uint16_t pNumObj, const bool delayCompensationEnabled );


		/------------------------------------------------------------------------------------------
		@@ -207,7 +204,6 @@ int main(
		reset_mem( USE_BYTES );
		#endif


		splitRendBits.bits_buf = splitRendBitsBuf;

		/------------------------------------------------------------------------------------------
		@@ -457,7 +453,6 @@ int main(
		}
		}


		/-------------------------------------------------------------------
		* Load renderer configuration from file
		--------------------------------------------------------------------/
		@@ -542,6 +537,7 @@ int main(
		fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );
		goto cleanup;
		}

		if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt_fx ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to get Distance Attenuation \n\n" );
		@@ -612,6 +608,7 @@ int main(
		hLsCustomData.azimuth_fx[i] = (Word32) ( hLsCustomData.azimuth[i] * ( 1u << 22 ) );
		hLsCustomData.elevation_fx[i] = (Word32) ( hLsCustomData.elevation[i] * ( 1u << 22 ) );
		}

		if ( ( error = IVAS_DEC_FeedCustomLsData( hIvasDec, hLsCustomData ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedCustomLsData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -670,11 +667,7 @@ int main(
		}
		else
		{
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, &hIvasDec, pcmBuf );
		#else
		error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );
		#endif
		}

		if ( error == IVAS_ERR_OK \|\| error == IVAS_ERR_END_OF_FILE )
		@@ -694,7 +687,6 @@ int main(
		goto cleanup;
		}


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

		if ( !arg.quietModeEnabled )
		{
		printf( "\n" );
		@@ -2002,11 +1993,7 @@ static ivas_error decodeG192(
		Vector3PairFileReader *referenceVectorReader,
		ObjectEditFileReader *objectEditFileReader,
		ISAR_SPLIT_REND_BITS_DATA *splitRendBits,
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		IVAS_DEC_HANDLE *phIvasDec,
		#else
		IVAS_DEC_HANDLE hIvasDec,
		#endif
		int16_t *pcmBuf )

		{
		@@ -2014,9 +2001,7 @@ static ivas_error decodeG192(
		uint16_t bit_stream[IVAS_MAX_BITS_PER_FRAME + 4 * 8];
		int16_t i, num_bits;
		int16_t bfi = 0;
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		IVAS_DEC_HANDLE hIvasDec = *phIvasDec;
		#endif
		AudioFileWriter *afWriter = NULL;
		MasaFileWriter *masaWriter = NULL;
		bool decodedGoodFrame = false;
		@@ -2040,9 +2025,7 @@ static ivas_error decodeG192(
		int16_t isSplitRend, isSplitCoded;
		IVAS_RENDER_CONFIG_DATA renderConfig;
		RenderConfigReader *renderConfigReader = NULL;
		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		bool restartNeeded;
		#endif
		bool restartNeeded = false;

		#ifdef VARIABLE_SPEED_DECODING
		if ( arg.tsmEnabled )
		@@ -2133,6 +2116,7 @@ static ivas_error decodeG192(
		fprintf( stderr, "\nError getting render frame size in samples\n" );
		return error;
		}

		if ( ( error = IVAS_DEC_GetReferencesUpdateFrequency( hIvasDec, &vec_pos_len ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError getting render frame size in samples\n" );
		@@ -2297,7 +2281,6 @@ static ivas_error decodeG192(
		return error;
		}

		#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH
		if ( ( error = IVAS_DEC_isRestartNeeded( hIvasDec, &restartNeeded ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -2311,7 +2294,6 @@ static ivas_error decodeG192(
		goto cleanup;
		}
		}
		#endif

		/* Placeholder for memory reallocation */
		/* ... */
		@@ -2430,6 +2412,16 @@ static ivas_error decodeG192(
		}
		}

		/* Output writing update in case of format switching and EXTERNAL output */
		if ( restartNeeded && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		if ( ( error = updateOnFormatSwitching( hIvasDec, &bsFormat, arg.outputWavFilename, &masaWriter, ismWriters, &nOutChannels, &numObj, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in updateOnFormatSwitching(): %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		}

		/* Write current frame */
		if ( decodedGoodFrame )
		{
		@@ -2823,7 +2815,7 @@ static ivas_error decodeVoIP(
		int16_t i;
		IVAS_DEC_HANDLE hIvasDec = *phIvasDec;

		bool restartNeeded;
		bool restartNeeded = false;
		IVAS_RTP ivasRtp = { 0 };
		IVAS_RTP srRtp = { 0 };
		IVAS_RTP_SR_INFO srInfo = { true, false, 0, 20, IVAS_SR_TRANSPORT_LCLD };
		@@ -3310,6 +3302,16 @@ static ivas_error decodeVoIP(
		}
		}

		/* Output writing update in case of format switching and EXTERNAL output */
		if ( restartNeeded && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		if ( ( error = updateOnFormatSwitching( hIvasDec, &bsFormat, arg.outputWavFilename, &masaWriter, ismWriters, &nOutChannels, &numObj, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in updateOnFormatSwitching(): %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		}

		/* Write current frame */
		if ( !srRtp.hPack && decodedGoodFrame )
		{
		@@ -3918,4 +3920,78 @@ static ivas_error load_hrtf_from_file(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* updateOnFormatSwitching()
		*
		* In case of IVAS format switching and EXTERNAL output,
		* update decoder wrt. output writing
		---------------------------------------------------------------------/

		static ivas_error updateOnFormatSwitching(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */
		IVAS_DEC_BS_FORMAT pBsFormat, / o : format of currently decoded bitstream */
		const char outputWavFilename, / i : name of the output audio file */
		MasaFileWriter *ppMasaWriter, / o : MasaFileWriter handle */
		IsmFileWriter ismWriters[IVAS_MAX_NUM_OBJECTS], / o : 1-4 ismWriters handles */
		int16_t pNumOutChannels, / o : number of output channels */
		uint16_t pNumObj, / o : number of ISM objects */
		const bool delayCompensationEnabled /* i : is delay compensation enabled */
		)
		{
		ivas_error error;

		/* in case of EXT output, the number of output audio channels can change */
		if ( ( error = IVAS_DEC_GetNumOutputChannels( hIvasDec, pNumOutChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetNumOutputChannels, code: %d\n", error );
		return error;
		}

		/* Get the format of currently decoded bitstream */
		if ( ( error = IVAS_DEC_GetFormat( hIvasDec, pBsFormat ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetFormat, code: %d\n", error );
		return error;
		}

		*pNumObj = 0;
		if ( pBsFormat == IVAS_DEC_BS_OBJ \|\| pBsFormat == IVAS_DEC_BS_MASA_ISM \|\| *pBsFormat == IVAS_DEC_BS_SBA_ISM )
		{
		if ( ( error = IVAS_DEC_GetNumObjects( hIvasDec, pNumObj ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetNumObjects: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		return error;
		}

		/* If outputting ISM/OMASA/OSBA, ensure the output metadata files are opened */
		for ( int16_t i = 0; i < *pNumObj; ++i )
		{
		if ( ismWriters[i] == NULL )
		{
		if ( ( error = IsmFileWriter_open( outputWavFilename, i, &ismWriters[i] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Error opening ISM decoded metadata file %s\n", IsmFileWriter_getFilePath( ismWriters[i] ) );
		return error;
		}
		}
		}
		}

		/* If outputting MASA, ensure the output file metadata is opened */
		if ( pBsFormat == IVAS_DEC_BS_MASA \|\| pBsFormat == IVAS_DEC_BS_MASA_ISM )
		{
		if ( ppMasaWriter != NULL )
		{
		if ( ( error = MasaFileWriter_open( outputWavFilename, delayCompensationEnabled, ppMasaWriter ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Error opening MASA decoded metadata file %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
		return error;
		}
		}
		}

		return IVAS_ERR_OK;
		}

		#undef WMC_TOOL_SKIP

lib_basop/basop32.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -896,7 +896,6 @@ Word16 shr_o( Word16 var1, Word16 var2, Flag *Overflow )

		Word16 shr( Word16 var1, Word16 var2 )
		{
		#ifdef FIX_BASOP_2563_CRASH_HQ_GENERIC_DEC
		Flag Overflow;
		Word16 result;

		@@ -908,9 +907,6 @@ Word16 shr( Word16 var1, Word16 var2 )
		assert( 0 );
		}
		return result;
		#else
		return shr_o( var1, var2, NULL );
		#endif
		}
		Word16 shr_sat( Word16 var1, Word16 var2 )
		{

lib_basop/enh64.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ Word64 W_add_nosat( Word64 L64_var1, Word64 L64_var2 )
		{
		Word64 L64_var_out;
		#ifdef FIX_2493_CHECK_64BIT
		assert( W_abs( ( ( L64_var1 + L64_var2 ) >> 1 ) - ( ( L64_var1 >> 1 ) + ( L64_var2 >> 1 ) ) ) < 2 );
		assert( !( ( L64_var2 > 0 && L64_var1 > MAX_64 - L64_var2 ) \|\| ( L64_var2 < 0 && L64_var1 < MIN_64 - L64_var2 ) ) );
		#endif
		L64_var_out = L64_var1 + L64_var2;

		@@ -124,7 +124,7 @@ Word64 W_sub_nosat( Word64 L64_var1, Word64 L64_var2 )
		{
		Word64 L64_var_out;
		#ifdef FIX_2493_CHECK_64BIT
		assert( W_abs( ( ( L64_var1 - L64_var2 ) >> 1 ) - ( ( L64_var1 >> 1 ) - ( L64_var2 >> 1 ) ) ) < 2 );
		assert( !( ( L64_var2 < 0 && L64_var1 > MAX_64 + L64_var2 ) \|\| ( L64_var2 > 0 && L64_var1 < MIN_64 + L64_var2 ) ) );
		#endif
		L64_var_out = L64_var1 - L64_var2;

		@@ -438,7 +438,7 @@ Word64 W_mac_32_16( Word64 L64_var1, Word32 L_var2, Word16 var3 )
		{
		Word64 L64_var_out = ( (Word64) L_var2 * var3 ) << 1;
		#ifdef FIX_2493_CHECK_64BIT
		assert( W_abs( ( ( L64_var_out + L64_var1 ) >> 1 ) - ( ( L64_var_out >> 1 ) + ( L64_var1 >> 1 ) ) ) < 2 );
		assert( !( ( L64_var_out > 0 && L64_var1 > MAX_64 - L64_var_out ) \|\| ( L64_var_out < 0 && L64_var1 < MIN_64 - L64_var_out ) ) );
		#endif
		L64_var_out += L64_var1;
		#ifdef WMOPS
		@@ -488,7 +488,7 @@ Word64 W_msu_32_16( Word64 L64_var1, Word32 L_var2, Word16 var3 )
		{
		Word64 L64_var_out = ( (Word64) L_var2 * var3 ) << 1;
		#ifdef FIX_2493_CHECK_64BIT
		assert( W_abs( ( ( L64_var1 - L64_var_out ) >> 1 ) - ( ( L64_var1 >> 1 ) - ( L64_var_out >> 1 ) ) ) < 2 );
		assert( !( ( L64_var_out < 0 && L64_var1 > MAX_64 + L64_var_out ) \|\| ( L64_var_out > 0 && L64_var1 < MIN_64 + L64_var_out ) ) );
		#endif
		L64_var_out = L64_var1 - L64_var_out;
		#ifdef WMOPS
		@@ -617,7 +617,7 @@ Word64 W_mac0_16_16( Word64 L64_var1, Word16 var2, Word16 var3 )
		{
		Word64 L64_var_out = (Word64) var2 * var3;
		#ifdef FIX_2493_CHECK_64BIT
		assert( W_abs( ( ( L64_var_out + L64_var1 ) >> 1 ) - ( ( L64_var_out >> 1 ) + ( L64_var1 >> 1 ) ) ) < 2 );
		assert( !( ( L64_var_out > 0 && L64_var1 > MAX_64 - L64_var_out ) \|\| ( L64_var_out < 0 && L64_var1 < MIN_64 - L64_var_out ) ) );
		#endif
		L64_var_out += L64_var1;
		#ifdef WMOPS
		@@ -666,7 +666,7 @@ Word64 W_msu0_16_16( Word64 L64_var1, Word16 var2, Word16 var3 )
		{
		Word64 L64_var_out = (Word64) var2 * var3;
		#ifdef FIX_2493_CHECK_64BIT
		assert( W_abs( ( ( L64_var1 - L64_var_out ) >> 1 ) - ( ( L64_var1 >> 1 ) - ( L64_var_out >> 1 ) ) ) < 2 );
		assert( !( ( L64_var_out < 0 && L64_var1 > MAX_64 + L64_var_out ) \|\| ( L64_var_out > 0 && L64_var1 < MIN_64 + L64_var_out ) ) );
		#endif
		L64_var_out = L64_var1 - L64_var_out;
		#ifdef WMOPS

lib_com/basop_util.c

+29 −11

Original line number	Diff line number	Diff line
		@@ -2720,25 +2720,43 @@ Word32 dotWord32_16_Mant32Exp( const Word32 bufX32, / i: 32-bit buffer with un
		const Word16 bufY16, / i: 16-bit buffer quite right-aligned */
		Word16 bufY16_exp, /* i: exponent of buffer bufY16 */
		Word16 len, /* i: buffer len to process */
		Word16 exp ) / o: result exponent */
		Word16 exp, / o: result exponent */
		const Word16 is_ivas ) /* i: flag indicating IVAS to maintain EVS BE */
		{
		Word32 L_sum;
		Word16 shift, shift1, i;


		shift = getScaleFactor32( bufX32, len ); /* current available headroom */
		IF( EQ_16( is_ivas, 1 ) )
		{
		shift = sub( shift, sub( 15, norm_s( len ) ) ); /* reduced required headroom */
		}
		ELSE
		{
		shift = sub( shift, sub( 14, norm_s( len ) ) ); /* reduced required headroom */
		}
		L_sum = 0; /* Clear accu */
		move32();
		FOR( i = 0; i < len; i++ )
		{
		IF( EQ_16( is_ivas, 1 ) )
		{
		L_sum = L_add( L_sum, Mpy_32_16_1( L_shl( bufX32[i], shift ), bufY16[i] ) );
		}
		ELSE
		{
		L_sum = L_mac0( L_sum, round_fx( L_shl( bufX32[i], shift ) ), bufY16[i] );
		}
		}
		shift1 = norm_l( L_sum );
		L_sum = L_shl( L_sum, shift1 ); /* return value */

		shift = sub( add( bufX32_exp, bufY16_exp ), add( shift, shift1 ) );
		IF( EQ_16( is_ivas, 0 ) )
		{
		shift = add( shift, 1 ); /* compensate for factor of 2 introduced by L_mac0 */
		}
		/* In case of NULL result, we want to have a 0 exponent too */
		if ( L_sum == 0 )
		shift = 0;