Remove PI appliance (6421effe) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+0 −30

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ typedef struct
		bool tsmEnabled;
		IVAS_RENDER_FRAMESIZE renderFramesize;
		#ifdef IVAS_RTPDUMP
		bool applyPiData;
		char *piOutputFilename;
		#endif
		#ifdef DEBUGGING
		@@ -1100,7 +1099,6 @@ static bool parseCmdlIVAS_dec(
		arg->enableExternalOrientation = false;
		arg->externalOrientationTrajFileName = NULL;
		#ifdef IVAS_RTPDUMP
		arg->applyPiData = false;
		arg->piOutputFilename = NULL;
		#endif

		@@ -1202,11 +1200,6 @@ static bool parseCmdlIVAS_dec(

		arg->piOutputFilename = argv[i++];
		}
		else if ( strcmp( argv_to_upper, "-APPLYPIDATA" ) == 0 )
		{
		arg->applyPiData = true;
		i++;
		}
		#endif
		#ifdef SUPPORT_JBM_TRACEFILE
		else if ( strcmp( argv_to_upper, "-TRACEFILE" ) == 0 )
		@@ -1810,7 +1803,6 @@ static void usage_dec( void )
		fprintf( stdout, " IVAS RTP Payload Format. The SDP parameter hf_only is required.\n" );
		fprintf( stdout, " Reading RFC4867 AMR/AMR-WB RTP payload format is not supported.\n" );
		fprintf( stdout, "-PiDataFile PF Log the timestampped PI data.\n" );
		fprintf( stdout, "-ApplyPiData Apply the PI data found in the rtp packet.\n" );
		#else
		fprintf( stdout, "-VOIP_hf_only=1 : VoIP mode: EVS RTP Payload Format hf_only=1 in rtpdump\n" );
		fprintf( stdout, " The decoder may read rtpdump files containing TS26.445 Annex A.2.2\n" );
		@@ -3583,28 +3575,6 @@ static ivas_error decodeVoIP(
		/* decode and get samples */
		while ( nSamplesRendered < nOutSamples )
		{
		#ifdef IVAS_RTPDUMP
		if ( arg.applyPiData )
		{
		/* Rudimentry Time Mapping to map system time to rtp timestamp */
		uint32_t piTs = systemTime_ms * 16 + initialTsOffsetSystemAndRTP;
		uint32_t numPiData = 0;

		while ( nProcPiData + numPiData < ivasRtp.nReadPiData &&
		ivasRtp.piData[nProcPiData + numPiData].timestamp <= piTs )
		{
		numPiData++;
		}

		if ( ( error = IVAS_RTP_ApplyPiData( hIvasDec, &ivasRtp.piData[nProcPiData], numPiData ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		nProcPiData += numPiData;
		}
		#endif
		#ifdef SUPPORT_JBM_TRACEFILE
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
		#else

lib_com/ivas_prot.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -806,19 +806,7 @@ void ivas_apply_non_diegetic_panning(
		const int16_t output_frame /* i : output frame length per channel */
		);

		#ifdef IVAS_RTPDUMP
		void QuaternionProduct(
		const IVAS_QUATERNION q1,
		const IVAS_QUATERNION q2,
		IVAS_QUATERNION *const r
		);

		void QuaternionInverse(
		const IVAS_QUATERNION q,
		IVAS_QUATERNION *const r
		);

		#endif
		/----------------------------------------------------------------------------------
		* JBM prototypes
		----------------------------------------------------------------------------------/

lib_dec/ivas_binRenderer_internal.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1030,11 +1030,7 @@ ivas_error ivas_binRenderer_open(
		ivas_dirac_dec_get_response( (int16_t) ls_azimuth_CICP19[k], (int16_t) ls_elevation_CICP19[k], hBinRenderer->hReverb->foa_enc[k], 1 );
		}
		}
		#ifdef IVAS_RTPDUMP
		else if ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation \|\| st_ivas->hCombinedOrientationData ) )
		#else
		else if ( st_ivas->ivas_format == MC_FORMAT && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
		#endif
		{
		if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK )
		{

lib_dec/ivas_dirac_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -2072,11 +2072,7 @@ void ivas_dirac_dec_render_sf(
		{
		mvs2s( &hSpatParamRendCom->azimuth[md_idx][hDirAC->hConfig->enc_param_start_band], &azimuth[hDirAC->hConfig->enc_param_start_band], hSpatParamRendCom->num_freq_bands - hDirAC->hConfig->enc_param_start_band );
		mvs2s( &hSpatParamRendCom->elevation[md_idx][hDirAC->hConfig->enc_param_start_band], &elevation[hDirAC->hConfig->enc_param_start_band], hSpatParamRendCom->num_freq_bands - hDirAC->hConfig->enc_param_start_band );
		#ifdef IVAS_RTPDUMP
		if ( ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation \|\| st_ivas->hCombinedOrientationData ) && st_ivas->hCombinedOrientationData->shd_rot_max_order == 0 )
		#else
		if ( ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) && st_ivas->hCombinedOrientationData->shd_rot_max_order == 0 )
		#endif
		{
		num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band];
		rotateAziEle_DirAC( azimuth, elevation, num_freq_bands, hSpatParamRendCom->num_freq_bands, p_Rmat );

lib_dec/ivas_init_dec.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -2145,11 +2145,7 @@ ivas_error ivas_init_decoder(
		}
		else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV \|\| st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )
		{
		#ifdef IVAS_RTPDUMP
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation \|\| st_ivas->hCombinedOrientationData ) )
		#else
		if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM && st_ivas->ivas_format == MC_FORMAT && ( st_ivas->hDecoderConfig->Opt_Headrotation \|\| st_ivas->hDecoderConfig->Opt_ExternalOrientation ) )
		#endif
		{
		if ( ( error = efap_init_data( &( st_ivas->hEFAPdata ), st_ivas->hIntSetup.ls_azimuth, st_ivas->hIntSetup.ls_elevation, st_ivas->hIntSetup.nchan_out_woLFE, EFAP_MODE_EFAP ) ) != IVAS_ERR_OK )
		{