- Merge remote-tracking branch 'remotes/origin/main' into float-1566-ext-output-in-format-switching (c0883654) · Commits · IVAS Codec Public Collaboration / IVAS Codec

CMakeLists.txt

+10 −3

Original line number	Diff line number	Diff line
		@@ -63,9 +63,16 @@ if(UNIX)
		# to be uncommented in CI
		# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")

		# don't override CMAKE_C_COMPILER if it's already set
		if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT CMAKE_C_COMPILER)
		# set C compiler
		find_program(cc NAMES clang-18 clang REQUIRED)
		set(CMAKE_C_COMPILER "${cc}" CACHE STRING "")
		find_program(cc NAMES clang-18 clang)
		if(cc)
		set(CMAKE_C_COMPILER "${cc}" CACHE FILEPATH "")
		else()
		message(WARNING "clang compiler not found - falling back to system default")
		endif()
		endif()

		# CLANG
		if(CLANG)

Workspace_msvc/lib_dec.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -270,7 +270,6 @@
		<ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c" />
		<ClCompile Include="..\lib_dec\jbm_jb4_jmf.c" />
		<ClCompile Include="..\lib_dec\jbm_pcmdsp_apa.c" />
		<ClCompile Include="..\lib_dec\jbm_pcmdsp_fifo.c" />
		<ClCompile Include="..\lib_dec\jbm_pcmdsp_similarityestimation.c" />
		<ClCompile Include="..\lib_dec\jbm_pcmdsp_window.c" />
		<ClCompile Include="..\lib_dec\LD_music_post_filter.c" />
		@@ -318,7 +317,6 @@
		<ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h" />
		<ClInclude Include="..\lib_dec\jbm_jb4_jmf.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_window.h" />
		<ClInclude Include="..\lib_dec\lib_dec.h" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −6

Original line number	Diff line number	Diff line
		@@ -415,9 +415,6 @@
		<ClCompile Include="..\lib_dec\jbm_pcmdsp_apa.c">
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\jbm_pcmdsp_fifo.c">
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_dec\jbm_pcmdsp_similarityestimation.c">
		<Filter>decoder_all_c</Filter>
		</ClCompile>
		@@ -532,9 +529,6 @@
		<ClInclude Include="..\lib_dec\jbm_jb4sb.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h">
		<Filter>decoder_h</Filter>
		</ClInclude>

apps/decoder.c

+106 −300

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+0 −23

Original line number	Diff line number	Diff line
		@@ -233,9 +233,7 @@ int main(
		uint16_t rtpEncSeed = RANDOM_INITSEED_ENC;
		uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) & 0x0000FFFF ) \| ( (uint32_t) IVAS_RTP_OwnRandom( &rtpEncSeed ) << 16 );
		uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpEncSeed );
		#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API
		uint8_t payloadType = DEFAULT_IVAS_PAYLOAD_TYPE; /* Dynamic PT are in range [96, 127] */
		#endif

		/------------------------------------------------------------------------------------------
		* Parse command-line arguments
		@@ -369,7 +367,6 @@ int main(
		}
		}

		#ifdef FIX_FMSW_DEC
		/------------------------------------------------------------------------------------------
		* Open remote requests file for rtp packing (E-bytes)
		------------------------------------------------------------------------------------------/
		@@ -389,7 +386,6 @@ int main(
		goto cleanup;
		}
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Handle Channel-aware mode
		@@ -651,11 +647,7 @@ int main(

		if ( arg.rtpdumpOutput )
		{
		#ifdef FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API
		if ( ( error = IVAS_RTP_WRITER_Init( &ivasRtp, arg.outputBitstreamFilename, arg.numFramesPerPacket, payloadType, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_RTP_WRITER_Init( &ivasRtp, arg.outputBitstreamFilename, arg.numFramesPerPacket, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError: Can't open output bitstream file for RTP output %s \n\n", arg.outputBitstreamFilename );
		goto cleanup;
		@@ -688,21 +680,6 @@ int main(
		}
		}

		#ifndef FIX_FMSW_DEC
		#ifdef FIX_1527_CMR_BITRATE_IDX
		/------------------------------------------------------------------------------------------
		* Open remote requests file for rtp packing (E-bytes)
		------------------------------------------------------------------------------------------/
		if ( arg.requestsFileName != NULL )
		{
		if ( ( error = RequestsFileReader_open( arg.requestsFileName, &requestsFileReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Can't open requests file %s \n\n", arg.requestsFileName );
		goto cleanup;
		}
		}
		#endif
		#endif
		/------------------------------------------------------------------------------------------
		* Run the encoder
		------------------------------------------------------------------------------------------/