Commit 00d5fbaf authored Apr 26, 2024 by Dominik Weckbecker

style and formatting changes

parent b97f2f81

lib_com/ivas_osba_com.c

+1 −1

Original line number	Diff line number	Diff line
		/******************************************************************************************************

		(C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		(C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

lib_com/ivas_prot.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -3020,10 +3020,11 @@ void ivas_mct_core_enc(
		const int32_t ivas_total_brate, /* i : IVAS total bitrate */
		const int16_t switch_bw, /* i : flag bandwidth switch occurance */
		const int16_t lfe_bits, /* i : bits spent for LFE */
		const int16_t sba_order /* i : Ambisonic (SBA) order */
		#ifdef NONBE_FIX_ISM_XOVER_BR
		,
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int16_t nchan_ism /* i : number of input ISM's */
		#else
		const int16_t sba_order /* i : Ambisonic (SBA) order */
		#endif
		);

lib_dec/ivas_corecoder_dec_reconfig.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -354,6 +354,7 @@ ivas_error ivas_corecoder_dec_reconfig(
		/-----------------------------------------------------------------
		* Set CNA/CNG flags
		-----------------------------------------------------------------/

		#ifdef NONBE_FIX_ISM_XOVER_BR
		if ( st_ivas->ivas_format == SBA_FORMAT \|\| st_ivas->ivas_format == MASA_FORMAT \|\| st_ivas->ivas_format == SBA_ISM_FORMAT )
		#else

lib_dec/ivas_sba_dec.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -577,6 +577,7 @@ ivas_error ivas_sba_dec_reconfigure(
		#endif
		}
		}

		#ifdef NONBE_FIX_ISM_XOVER_BR
		if ( ( error = ivas_corecoder_dec_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old,
		sba_dirac_stereo_flag_old, st_ivas->hDecoderConfig->ivas_total_brate / n_all,

lib_enc/ivas_init_enc.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -736,6 +736,7 @@ ivas_error ivas_init_encoder(
		else
		{
		/* allocate and initialize MCT core coder */

		#ifdef NONBE_FIX_ISM_XOVER_BR
		{
		int16_t n_all;