Correct merge conflict resolution errors. (5daeb2c4) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+0 −118

Original line number	Diff line number	Diff line
		@@ -65,15 +65,6 @@ static
		int32_t frame = 0; /* Counter of frames */

		#define RANDOM_INITSEED_DEC ( 0xFADE )
		<<<<<<< HEAD
		<<<<<<< HEAD
		=======
		#else
		#define RANDOM_INITSEED_DEC ( 0xFEEDFADE )
		#endif
		>>>>>>> 526949b21 (accept RTPDUMP switches)
		=======
		>>>>>>> 60093d3e5 (acceptance of switches, step 1)

		#ifdef DEBUGGING
		#define MIN_NUM_BITS_ACTIVE_FRAME 56
		@@ -142,21 +133,6 @@ typedef struct
		bool applyPiData;
		char *piOutputFilename;
		bool rtpOutSR;
		<<<<<<< HEAD
		<<<<<<< HEAD
		<<<<<<< HEAD
		=======
		#ifdef FIX_1419_MONO_STEREO_UMX
		bool evsMode;
		#endif
		>>>>>>> 526949b21 (accept RTPDUMP switches)
		=======
		bool evsMode;
		>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)
		=======
		#endif
		#ifdef FIX_1318_ROOM_SIZE_CMD_LINE
		>>>>>>> 76499842b (port fix)
		IVAS_ROOM_SIZE_T roomSize;

		} DecArguments;
		@@ -907,13 +883,6 @@ static bool parseCmdlIVAS_dec(
		arg->output_Fs = IVAS_MAX_SAMPLING_RATE;
		arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;
		arg->decMode = IVAS_DEC_MODE_IVAS;
		<<<<<<< HEAD
		<<<<<<< HEAD
		=======
		arg->evsMode = false;
		>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)
		=======
		>>>>>>> 76499842b (port fix)
		arg->quietModeEnabled = false;
		arg->delayCompensationEnabled = true;
		arg->voipMode = false;
		@@ -1410,13 +1379,6 @@ static bool parseCmdlIVAS_dec(
		arg->decMode = IVAS_DEC_MODE_EVS;
		i++;
		}
		<<<<<<< HEAD
		<<<<<<< HEAD
		=======
		#endif
		>>>>>>> 526949b21 (accept RTPDUMP switches)
		=======
		>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)
		else if ( strcmp( argv_to_upper, "-ROOM_SIZE" ) == 0 )
		{
		i++;
		@@ -1504,16 +1466,7 @@ static bool parseCmdlIVAS_dec(
		usage_dec();
		return false;
		}
		<<<<<<< HEAD
		<<<<<<< HEAD
		else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->decMode == IVAS_DEC_MODE_EVS )
		=======
		else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->evsMode )
		>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)
		=======
		#ifdef FIX_1419_MONO_STEREO_UMX
		else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->decMode == IVAS_DEC_MODE_EVS )
		>>>>>>> 76499842b (port fix)
		{
		fprintf( stderr, "Error: Both non-diegetic panning and stereo output specified!\n\n" );
		usage_dec();
		@@ -1768,20 +1721,6 @@ static ivas_error initOnFirstGoodFrame(
		uint16_t rtpDecSeed = RANDOM_INITSEED_DEC;
		uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) & 0x0000FFFF ) \| ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) << 16 );
		uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpDecSeed );
		<<<<<<< HEAD
		<<<<<<< HEAD
		=======
		#else
		/* Ideally ssrc is negotiated via SDP and sequence number is radomized but we
		use fixed seed for random num generator for regression based tests. Any realtime
		application should implement this initialization seperately */
		srand( RANDOM_INITSEED_DEC );
		uint32_t ssrc = ( (uint32_t) rand() & 0x0000FFFF ) \| ( (uint32_t) rand() << 16 );
		uint16_t seqNumInitVal = (uint16_t) ( rand() & 0xFFFF );
		#endif
		>>>>>>> 526949b21 (accept RTPDUMP switches)
		=======
		>>>>>>> 60093d3e5 (acceptance of switches, step 1)

		if ( ( error = IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp ) ) != IVAS_ERR_OK )
		{
		@@ -1891,21 +1830,8 @@ static ivas_error initOnFirstGoodFrame(
		return error;
		}
		}
		<<<<<<< HEAD
		<<<<<<< HEAD
		<<<<<<< HEAD

		if ( !isSplitCoded )
		=======
		else
		>>>>>>> 554f97d05 (accept FIX_1119_SPLIT_RENDERING_VOIP)
		=======

		=======

		>>>>>>> 6115666d3 (clang-format)
		if ( !isSplitCoded )
		>>>>>>> 245a6d7b0 (fix)
		{
		if ( pRemainingDelayNumSamples < numOutSamples )
		{
		@@ -3351,40 +3277,8 @@ static ivas_error decodeVoIP(
		/* Once good frame decoded, catch up */
		if ( decodedGoodFrame )
		{
		<<<<<<< HEAD
		<<<<<<< HEAD
		if ( ( error = initOnFirstGoodFrame( hIvasDec, arg, numInitialBadFrames, &nOutSamples, &vec_pos_len, delayNumSamples_orig, &delayNumSamples, &delayTimeScale,
		&bsFormat, &afWriter, &masaWriter, ismWriters, &nOutChannels, &numObj, &srRtp, &splitRendWriter ) ) != IVAS_ERR_OK )
		=======
		#ifndef FIX_1119_SPLIT_RENDERING_VOIP
		SplitFileReadWrite *splitRendWriter = NULL;

		#endif
		if ( ( error = initOnFirstGoodFrame( hIvasDec,
		arg,
		numInitialBadFrames,
		&nOutSamples,
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		&vec_pos_len,
		#else
		NULL,
		#endif
		delayNumSamples_orig,
		&delayNumSamples,
		&delayTimeScale,
		&bsFormat,
		&afWriter,
		&masaWriter,
		ismWriters,
		&nOutChannels,
		&numObj,
		&srRtp,
		&splitRendWriter ) ) != IVAS_ERR_OK )
		>>>>>>> 526949b21 (accept RTPDUMP switches)
		=======
		if ( ( error = initOnFirstGoodFrame( hIvasDec, arg, numInitialBadFrames, &nOutSamples, &vec_pos_len, delayNumSamples_orig, &delayNumSamples, &delayTimeScale,
		&bsFormat, &afWriter, &masaWriter, ismWriters, &nOutChannels, &numObj, &srRtp, &splitRendWriter ) ) != IVAS_ERR_OK )
		>>>>>>> 554f97d05 (accept FIX_1119_SPLIT_RENDERING_VOIP)
		{
		goto cleanup;
		}
		@@ -3769,21 +3663,9 @@ static void do_object_editing_fx(
		if ( readInfo->obj_radius_relative[obj_idx] )
		{
		/* radius: apply relative edit + saturation */
		<<<<<<< HEAD
		<<<<<<< HEAD
		Word32 L_tmp1 = L_mult( editableParameters->ism_metadata[obj_idx].radius_fx, (Word16) ( readInfo->obj_radius[obj_idx] * ( 1L << ( 9 ) ) ) ); /SQSQ where SQ=9*/
		Word32 L_tmp2 = L_shl_sat( L_tmp1, ( 9 - ( 9 + 9 + 1 - 16 ) ) /* ^shift by 6 == mult by 2^6 = 64.0 / ); /shift back to Q(9+16)*/
		Word16 temp_radius = round_fx( L_tmp2 ); /* Q25 -> Q9 */
		=======
		Word32 L_tmp1 = L_mult( editableParameters->ism_metadata[obj_idx].radius_fx, (Word16) ( readInfo->obj_radius[obj_idx] * ( 1L << ( SQ ) ) ) ); /SQSQ*/
		Word32 L_tmp2 = L_shl_sat( L_tmp1, ( 9 - ( 9 + 9 + 1 - 16 ) ) /* ^shift by 6 == mult by 2^6 = 64.0 / ); /shift back to Q(9+16)*/
		Word16 temp_radius = round_fx( L_tmp2 ); /* Q25 -> Q9 */
		>>>>>>> 619c049f8 (accept object-editing switches)
		=======
		Word32 L_tmp1 = L_mult( editableParameters->ism_metadata[obj_idx].radius_fx, (Word16) ( readInfo->obj_radius[obj_idx] * ( 1L << ( 9 ) ) ) ); /SQSQ where SQ=9*/
		Word32 L_tmp2 = L_shl_sat( L_tmp1, ( 9 - ( 9 + 9 + 1 - 16 ) ) /* ^shift by 6 == mult by 2^6 = 64.0 / ); /shift back to Q(9+16)*/
		Word16 temp_radius = round_fx( L_tmp2 ); /* Q25 -> Q9 */
		>>>>>>> 60093d3e5 (acceptance of switches, step 1)
		temp_radius = s_max( s_min( temp_radius, OBJ_EDIT_RADIUS_MAX_FX ), 0 );

		/* L_tmp2 is in S31Q25 stored in a signed Word32

lib_enc/ivas_cpe_enc_fx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@
		#include "ivas_cnst.h"
		#include "prot_fx.h"
		#include "ivas_rom_com.h"
		#include "rom_com.h"
		#ifdef DEBUGGING
		#include "debug.h"
		#endif