Makes ISM rendering to LS in OMASA closer to separate ISM rendering to LS.... (7bba4f3a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_ism_config.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -394,7 +394,6 @@ ivas_error ivas_ism_config(
		{
		return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\nError: Mismatch in ISm bit-budget distribution. Exiting!\n" );
		}

		}
		#endif

+5 −9

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@
		#endif



		/*---------------------------------------------------------------
		* ivas_omasa_ism_mode_select()
		*
		@@ -179,7 +178,6 @@ ISM_MODE ivas_omasa_ism_mode_select(
		}



		/*---------------------------------------------------------------
		* ivas_interformat_brate()
		*
		@@ -209,8 +207,7 @@ int32_t ivas_interformat_brate(
		}
		else
		{
		if ( ism_mode == ISM_MASA_MODE_DISC && ( ( nchan_ism == 4 && element_brate == 24000 ) \|\| ( nchan_ism == 3 && element_brate <= 24000 )
		\|\| ( nchan_ism == 2 && element_brate <= 11000 ) ) ) /* for border case in DISC mode */
		if ( ism_mode == ISM_MASA_MODE_DISC && ( ( nchan_ism == 4 && element_brate == 24000 ) \|\| ( nchan_ism == 3 && element_brate <= 24000 ) \|\| ( nchan_ism == 2 && element_brate <= 11000 ) ) ) /* for border case in DISC mode */
		{

		#ifdef OMASA_UPDATES
		@@ -517,4 +514,3 @@ int16_t calculate_brate_limit_flag(int16_t * ism_imp, int16_t num_obj)
		return brate_limit_flag;
		}
		#endif

+8 −0

Original line number	Diff line number	Diff line
		@@ -4744,6 +4744,10 @@ ivas_error vbap_init_data(
		const float speaker_node_azi_deg, / i : vector of speaker node azimuths (positive left) */
		const float speaker_node_ele_deg, / i : vector of speaker node elevations (positive up) */
		const int16_t num_speaker_nodes /* i : number of speaker nodes in the set */
		#ifdef OMASA_UPDATES
		,
		const int16_t support_object_mode /* i : init VBAP also for object panning mode */
		#endif
		);

		void vbap_free_data(
		@@ -4755,6 +4759,10 @@ void vbap_determine_gains(
		float gains, / o : gain vector for speaker nodes for given direction */
		const int16_t azi_deg, /* i : azimuth in degrees for panning direction (positive left) */
		const int16_t ele_deg /* i : elevation in degrees for panning direction (positive up) */
		#ifdef OMASA_UPDATES
		,
		const int16_t use_object_mode /* i : select between object mode panning and spatial mode panning */
		#endif
		);

		void v_sort_ind(

100755 → 100644

+1 −1

File changed.File mode changed from 100755 to 100644.

Contains only whitespace changes.

+1 −2