clang-format + more cleaning (1aeaaeaa) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@
		#include "obj_edit_file_reader.h"
		#include "vector3_pair_file_reader.h"
		#include "wmc_auto.h"
		#include "options.h"
		#include "stl.h"
		#ifdef IVAS_RTPDUMP
		#include "ivas_rtp_file.h"

apps/encoder.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@
		*******************************************************************************************************/

		#include <string.h>
		#include "options.h"
		#ifdef DEBUGGING
		#include "debug.h"
		#endif

lib_com/ivas_tools_fx.c

+0 −90

Original line number	Diff line number	Diff line
		@@ -1992,26 +1992,6 @@ void lls_interp_n_fx(
		}


		/* helper function for panning_wrap_angles */
		static float wrap_azi(
		const float azi_deg )
		{
		float azi = azi_deg;

		/* Wrap azimuth value */
		while ( azi > 180 )
		{
		azi -= 360.0f;
		}

		while ( azi <= -180 )
		{
		azi += 360;
		}

		return azi;
		}

		/* helper function for panning_wrap_angles */
		static Word32 wrap_azi_fx(
		const Word32 azi_deg /* Q22 */ )
		@@ -2034,76 +2014,6 @@ static Word32 wrap_azi_fx(
		}


		/-------------------------------------------------------------------
		* panning_wrap_angles()
		*
		* Wrap angles for amplitude panning to the range:
		* azimuth = (-180, 180]
		* elevation = [-90, 90]
		* Considers direction changes from large elevation values
		-------------------------------------------------------------------/

		void panning_wrap_angles(
		const float azi_deg, /* i : azimuth in degrees for panning direction (positive left) */
		const float ele_deg, /* i : elevation in degrees for panning direction (positive up) */
		float azi_wrapped, / o : wrapped azimuth component */
		float ele_wrapped / o : wrapped elevation component */
		)
		{
		float azi, ele;

		azi = azi_deg;
		ele = ele_deg;

		if ( fabsf( ele ) < 90 )
		{
		*ele_wrapped = ele;
		*azi_wrapped = wrap_azi( azi );
		return;
		}
		else
		{
		/* Special case when elevation is a multiple of 90; azimuth is irrelevant */
		if ( ( fmodf( ele, 90 ) == 0 ) && ( fmodf( ele, 180 ) != 0 ) )
		{
		*azi_wrapped = 0;
		while ( ele > 90 )
		{
		ele -= 360;
		}
		while ( ele < -90 )
		{
		ele += 360;
		}
		*ele_wrapped = ele;
		}
		else
		{
		/* Wrap elevation and adjust azimuth accordingly */
		while ( fabsf( ele ) > 90 )
		{
		/* Flip to other hemisphere */
		azi += 180;

		/* Compensate elevation accordingly */
		if ( ele > 90 )
		{
		ele = 180 - ele;
		}
		else if ( ele < -90 )
		{
		ele = -180 - ele;
		}
		}
		*azi_wrapped = wrap_azi( azi );
		*ele_wrapped = ele;
		}

		return;
		}
		}


		/-------------------------------------------------------------------
		* panning_wrap_angles_fx()
		*

lib_util/float_to_fix_ops.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,4 +17,3 @@ float fixedToFloat( const Word32 i, const Word16 Q );
		float fix16_to_float( const Word16 number, const Word16 Q );

		#endif /* FLOAT_TO_FIX_OPS_H */

lib_util/ls_custom_file_reader.c

+91 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@
		#include "ls_custom_file_reader.h"
		#include <stdlib.h>
		#include <string.h>
		#include "ivas_prot_fx.h"
		#include <math.h>


		struct LsCustomFileReader
		@@ -105,6 +105,96 @@ void CustomLsReader_close(
		}


		/-------------------------------------------------------------------
		* panning_wrap_angles()
		*
		* Wrap angles for amplitude panning to the range:
		* azimuth = (-180, 180]
		* elevation = [-90, 90]
		* Considers direction changes from large elevation values
		-------------------------------------------------------------------/

		/* helper function for panning_wrap_angles */
		static float wrap_azi(
		const float azi_deg )
		{
		float azi = azi_deg;

		/* Wrap azimuth value */
		while ( azi > 180 )
		{
		azi -= 360.0f;
		}

		while ( azi <= -180 )
		{
		azi += 360;
		}

		return azi;
		}

		static void panning_wrap_angles(
		const float azi_deg, /* i : azimuth in degrees for panning direction (positive left) */
		const float ele_deg, /* i : elevation in degrees for panning direction (positive up) */
		float azi_wrapped, / o : wrapped azimuth component */
		float ele_wrapped / o : wrapped elevation component */
		)
		{
		float azi, ele;

		azi = azi_deg;
		ele = ele_deg;

		if ( fabsf( ele ) < 90 )
		{
		*ele_wrapped = ele;
		*azi_wrapped = wrap_azi( azi );
		return;
		}
		else
		{
		/* Special case when elevation is a multiple of 90; azimuth is irrelevant */
		if ( ( fmodf( ele, 90 ) == 0 ) && ( fmodf( ele, 180 ) != 0 ) )
		{
		*azi_wrapped = 0;
		while ( ele > 90 )
		{
		ele -= 360;
		}
		while ( ele < -90 )
		{
		ele += 360;
		}
		*ele_wrapped = ele;
		}
		else
		{
		/* Wrap elevation and adjust azimuth accordingly */
		while ( fabsf( ele ) > 90 )
		{
		/* Flip to other hemisphere */
		azi += 180;

		/* Compensate elevation accordingly */
		if ( ele > 90 )
		{
		ele = 180 - ele;
		}
		else if ( ele < -90 )
		{
		ele = -180 - ele;
		}
		}
		*azi_wrapped = wrap_azi( azi );
		*ele_wrapped = ele;
		}

		return;
		}
		}


		/-------------------------------------------------------------------------
		* CustomLoudspeakerLayout_validate()
		*

lib_util/float_to_fix_ops.c

+7 −7

File changed.

Contains only whitespace changes.