Code comments (bfbc2e27) · Commits · IVAS Codec Public Collaboration / IVAS Codec

Workspace_msvc/lib_util.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -112,7 +112,6 @@
		<ClCompile Include="..\lib_util\g192.c" />
		<ClCompile Include="..\lib_util\ivas_rtp_payload.c" />
		<ClCompile Include="..\lib_util\ivas_rtp_pi_data.c" />
		<ClCompile Include="..\lib_util\ivas_rtp_rom.c" />
		<ClCompile Include="..\lib_util\ivas_bpool.c" />
		<ClCompile Include="..\lib_util\ivas_queue.c" />
		<ClCompile Include="..\lib_util\ivas_rtp_file.c" />
		@@ -145,7 +144,6 @@
		<ClInclude Include="..\lib_util\cmdl_tools.h" />
		<ClInclude Include="..\lib_util\evs_rtp_payload.h" />
		<ClInclude Include="..\lib_util\g192.h" />
		<ClInclude Include="..\lib_util\ivas_rtp_payload.h" />
		<ClInclude Include="..\lib_util\vector3_pair_file_reader.h" />
		<ClInclude Include="..\lib_util\hrtf_file_reader.h" />
		<ClInclude Include="..\lib_util\ism_file_reader.h" />

Workspace_msvc/lib_util.vcxproj.filters

+0 −6

Original line number	Diff line number	Diff line
		@@ -88,9 +88,6 @@
		<ClCompile Include="..\lib_util\ivas_rtp_pi_data.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\ivas_rtp_rom.c">
		<Filter>util_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_util\ivas_bpool.c">
		<Filter>util_c</Filter>
		</ClCompile>
		@@ -189,9 +186,6 @@
		<ClInclude Include="..\lib_util\vector3_pair_file_reader.h">
		<Filter>util_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_util\ivas_rtp_payload.h">
		<Filter>util_h</Filter>
		</ClInclude>
		</ItemGroup>
		<ItemGroup>
		<Filter Include="util_c">

apps/decoder.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -568,7 +568,7 @@ static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, Obj
		#ifdef IVAS_RTPDUMP
		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, IVAS_DEC_HANDLE phIvasDec, int16_t pcmBuf );

		static int restartDecoder(
		static ivas_error restartDecoder(
		IVAS_DEC_HANDLE *phIvasDec,
		IVAS_DEC_MODE codec,
		DecArguments *arg,
		@@ -580,7 +580,7 @@ static int restartDecoder(

		if ( phIvasDec == NULL )
		{
		return -1;
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		if ( NULL != *phIvasDec )
		@@ -665,12 +665,11 @@ static int restartDecoder(
		}
		}

		return 0;
		return IVAS_ERR_OK;

		cleanup:
		IVAS_DEC_Close( phIvasDec );

		return -1;
		return error;
		}
		#else
		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, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
		@@ -3742,14 +3741,14 @@ static ivas_error decodeVoIP(
		if ( ivasRtp.restartNeeded )
		{
		IVAS_DEC_MODE newCodecInPacket = ( ivasRtp.codecId == IVAS_RTP_EVS ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;
		int err = restartDecoder(
		error = restartDecoder(
		&hIvasDec,
		newCodecInPacket,
		&arg,
		NULL, /* ToDo : Provide rendererConfig */
		NULL /* ToDo : Provide LS Custom Data */
		);
		if ( err < 0 )
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nFailed to restart decoder from %d to %d\n", arg.decMode, newCodecInPacket );
		goto cleanup;

apps/encoder.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -876,7 +876,7 @@ int main(

		/* Push Encoded Stream to */
		if ( ( error = IVAS_RTP_PACK_PushFrame( hPack,
		IVAS_isImmersiveFormat( hIvasEnc ) ? IVAS_RTP_IVAS : IVAS_RTP_EVS,
		arg.inputFormat != IVAS_ENC_INPUT_MONO ? IVAS_RTP_IVAS : IVAS_RTP_EVS,
		#ifdef RTP_S4_251135_CR26253_0016_REV1
		NULL,
		#endif /* RTP_S4_251135_CR26253_0016_REV1 */

lib_com/bitstream.c

+0 −52

Original line number	Diff line number	Diff line
		@@ -163,58 +163,6 @@ Word16 rate2EVSmode(
		return rate2AMRWB_IOmode( brate );
		}

		#ifdef IVAS_RTPDUMP
		/-------------------------------------------------------------------
		* rate2IVASmode()
		*
		* Lookup IVAS mode. Note: FRAME_NO_DATA frames should be looked up with rate2EVSmode().
		-------------------------------------------------------------------/
		Word16 rate2IVASmode(
		const Word32 brate /* i : bitrate */
		)
		{
		switch ( brate )
		{
		/* IVAS modes */
		case IVAS_SID_5k2:
		return IVAS_TOC_SID;
		case IVAS_13k2:
		return IVAS_TOC_13200;
		case IVAS_16k4:
		return IVAS_TOC_16400;
		case IVAS_24k4:
		return IVAS_TOC_24400;
		case IVAS_32k:
		return IVAS_TOC_32000;
		case IVAS_48k:
		return IVAS_TOC_48000;
		case IVAS_64k:
		return IVAS_TOC_64000;
		case IVAS_80k:
		return IVAS_TOC_80000;
		case IVAS_96k:
		return IVAS_TOC_96000;
		case IVAS_128k:
		return IVAS_TOC_128000;
		case IVAS_160k:
		return IVAS_TOC_160000;
		case IVAS_192k:
		return IVAS_TOC_192000;
		case IVAS_256k:
		return IVAS_TOC_256000;
		case IVAS_384k:
		return IVAS_TOC_384000;
		case IVAS_512k:
		return IVAS_TOC_512000;
		default:
		break;
		}

		return -1;
		}

		#endif

		/-------------------------------------------------------------------
		* ind_list_realloc()
		*