[cleanup] accept NOKIA_ADAPTIVE_BINAURAL_PROTOS, NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT (a27e3c19) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -143,8 +143,6 @@



		#define NOKIA_ADAPTIVE_BINAURAL_PROTOS /* Nokia: Contribution 28: Adaptive binaural prototypes */
		#define NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT /* Nokia: enable adaptive binaural prototype complexity optimizations */

		#define FIX_389_EXT_REND_PCM_SR /* Nokia: Issue 389: Fix assignment of sample rate with PCM input. */
		#define FIX_390_EXT_REND_MASA_META_COPY /* Nokia: Issue 390: Fixes MASA metadata copying to renderer. */

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −76

Original line number	Diff line number	Diff line
		@@ -40,9 +40,7 @@
		#include "ivas_cnst.h"
		#include "ivas_rom_binauralRenderer.h"
		#include "ivas_rom_rend.h"
		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
		#include "ivas_rom_com.h"
		#endif

		#ifdef DEBUGGING
		#include "debug.h"
		@@ -58,19 +56,13 @@
		#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN ( 2.0f )
		#define IVAS_TDET_DUCK_MULT_FAC_PARA_BIN_LOW_BR ( 3.0f )

		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
		/* powf(0.95f, 4.0f) for sub-frame smoothing instead of CLDFB slot */
		#define ADAPT_HTPROTO_IIR_FAC 0.81450625f
		#else
		#define ADAPT_HTPROTO_IIR_FAC 0.95f
		#endif

		#define ADAPT_HTPROTO_ILD_LIM_DB0 1.0f
		#define ADAPT_HTPROTO_ILD_LIM_DB1 4.0f
		#define ADAPT_HTPROTO_ROT_LIM_0 0.4f
		#define ADAPT_HTPROTO_ROT_LIM_1 0.8f
		#endif

		/*-------------------------------------------------------------------------
		* Local function prototypes
		@@ -86,9 +78,7 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices( Decoder_Struc

		static void ivas_dirac_dec_binaural_process_output( Decoder_Struct *st_ivas, float output_f[][L_FRAME48k], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const int16_t max_band_decorr, const uint8_t numInputChannels, const uint8_t firstSlot, const uint8_t slotEnd );

		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
		static void adaptTransportSignalsHeadtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const uint8_t firstSlot, const uint8_t slotEnd, const uint8_t nBins, float Rmat[3][3] );
		#endif

		static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( HEAD_TRACK_DATA_HANDLE hHeadTrackData, float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], float inRe[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], const uint8_t firstSlot, const uint8_t slotEnd, const uint8_t nBins, float Rmat[3][3] );

		@@ -572,9 +562,7 @@ static void ivas_dirac_dec_binaural_internal(

		if ( nchan_transport == 2 )
		{
		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
		adaptTransportSignalsHeadtracked( st_ivas->hHeadTrackData, Cldfb_RealBuffer_in, Cldfb_ImagBuffer_in, firstSlot, slotEnd, nBins, Rmat );
		#endif

		ivas_dirac_dec_binaural_check_and_switch_transports_headtracked( st_ivas->hHeadTrackData, Cldfb_ImagBuffer_in, Cldfb_RealBuffer_in, firstSlot, slotEnd, nBins, Rmat );
		}
		@@ -1346,7 +1334,6 @@ static void ivas_dirac_dec_binaural_process_output(
		}


		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
		static void adaptTransportSignalsHeadtracked(
		HEAD_TRACK_DATA_HANDLE hHeadTrackData,
		float inIm[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],
		@@ -1357,14 +1344,9 @@ static void adaptTransportSignalsHeadtracked(
		float Rmat[3][3] )
		{
		int16_t slot, ch, bin, louderCh;
		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
		float ILD, mono_factor_ILD, mono_factor_rotation, mono_factor, y_val, ene_proc, ene_target;
		uint8_t n_slots_per_sf, sf_idx, n_sf;
		int16_t max_band;
		#else
		float re[2], im[2], ILD, mono_factor_ILD, mono_factor_rotation, mono_factor, y_val;
		float proc_re[2], proc_im[2], sum_re, sum_im, ene_proc, ene_target, mf;
		#endif

		/* Determine head-orientation-based mono factor.
		Rmat[1][1] entry informs how close the ears are aligned according to transport signals. */
		@@ -1373,7 +1355,6 @@ static void adaptTransportSignalsHeadtracked(
		mono_factor_rotation = fmaxf( 0.0f, fminf( 1.0f, mono_factor_rotation ) );

		/* Adapt transport signals in frequency bands */
		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
		/* optimization grouping CLDFB bins into MASA bands (they are readily available in ROM and suitable for the task) AND group CLDFB slots into sub-frames */
		n_slots_per_sf = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES;
		n_sf = ( slotEnd - firstSlot ) / n_slots_per_sf;
		@@ -1476,66 +1457,9 @@ static void adaptTransportSignalsHeadtracked(
		}
		}
		}
		#else
		/* original contribution */
		for ( slot = firstSlot; slot < slotEnd; slot++ )
		{
		float eqVal[60];

		for ( bin = 0; bin < nBins; bin++ )
		{
		/* Determine channel energies */
		for ( ch = 0; ch < 2; ch++ )
		{
		re[ch] = inRe[ch][slot][bin];
		im[ch] = inIm[ch][slot][bin];

		hHeadTrackData->chEneIIR[ch][bin] *= ADAPT_HTPROTO_IIR_FAC;
		hHeadTrackData->chEneIIR[ch][bin] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ( ( re[ch] * re[ch] ) + ( im[ch] * im[ch] ) );
		}

		/* Determine ILD */
		ILD = fabsf( 10.0f * log10f( fmaxf( 1e-12f, hHeadTrackData->chEneIIR[0][bin] ) / fmaxf( 1e-12f, hHeadTrackData->chEneIIR[1][bin] ) ) );
		louderCh = ( hHeadTrackData->chEneIIR[1][bin] > hHeadTrackData->chEneIIR[0][bin] );

		/* Determine ILD-based mono factor */
		mono_factor_ILD = ( ILD - ADAPT_HTPROTO_ILD_LIM_DB0 ) / ( ADAPT_HTPROTO_ILD_LIM_DB1 - ADAPT_HTPROTO_ILD_LIM_DB0 );
		mono_factor_ILD = fmaxf( 0.0f, fminf( 1.0f, mono_factor_ILD ) );

		/* Combine mono factors */
		mono_factor = mono_factor_ILD * mono_factor_rotation;

		/* Mix original audio and sum signal according to determined mono factor */
		sum_re = re[0] + re[1];
		sum_im = im[0] + im[1];
		for ( ch = 0; ch < 2; ch++ )
		{
		mf = ( ch == louderCh ) ? 0.0f : mono_factor;

		proc_re[ch] = mf * sum_re + ( 1.0f - mf ) * re[ch];
		proc_im[ch] = mf * sum_im + ( 1.0f - mf ) * im[ch];

		hHeadTrackData->procChEneIIR[ch][bin] *= ADAPT_HTPROTO_IIR_FAC;
		hHeadTrackData->procChEneIIR[ch][bin] += ( 1.0f - ADAPT_HTPROTO_IIR_FAC ) * ( ( proc_re[ch] * proc_re[ch] ) + ( proc_im[ch] * proc_im[ch] ) );
		}

		/* Equalize */
		ene_target = hHeadTrackData->chEneIIR[0][bin] + hHeadTrackData->chEneIIR[1][bin];
		ene_proc = hHeadTrackData->procChEneIIR[0][bin] + hHeadTrackData->procChEneIIR[1][bin];
		eqVal[bin] = fminf( 4.0f, sqrtf( ene_target / fmaxf( 1e-12f, ene_proc ) ) );

		for ( ch = 0; ch < 2; ch++ )
		{
		inRe[ch][slot][bin] = proc_re[ch] * eqVal[bin];
		inIm[ch][slot][bin] = proc_im[ch] * eqVal[bin];
		}
		}
		}
		#endif

		return;
		}
		#endif


		static void ivas_dirac_dec_binaural_check_and_switch_transports_headtracked(

lib_rend/ivas_rotation.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -85,19 +85,10 @@ ivas_error ivas_headTrack_open(
		( *hHeadTrackData )->Rmat_prev[i][i] = 1.0f;
		}

		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
		set_zero( ( *hHeadTrackData )->chEneIIR[0], MASA_FREQUENCY_BANDS );
		set_zero( ( *hHeadTrackData )->chEneIIR[1], MASA_FREQUENCY_BANDS );
		set_zero( ( *hHeadTrackData )->procChEneIIR[0], MASA_FREQUENCY_BANDS );
		set_zero( ( *hHeadTrackData )->procChEneIIR[1], MASA_FREQUENCY_BANDS );
		#else
		set_zero( ( *hHeadTrackData )->chEneIIR[0], CLDFB_NO_CHANNELS_MAX );
		set_zero( ( *hHeadTrackData )->chEneIIR[1], CLDFB_NO_CHANNELS_MAX );
		set_zero( ( *hHeadTrackData )->procChEneIIR[0], CLDFB_NO_CHANNELS_MAX );
		set_zero( ( *hHeadTrackData )->procChEneIIR[1], CLDFB_NO_CHANNELS_MAX );
		#endif
		#endif

		return IVAS_ERR_OK;
		}

lib_rend/ivas_stat_rend.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -274,15 +274,8 @@ typedef struct ivas_binaural_head_track_struct
		uint8_t lrSwitchedCurrent;
		float lrSwitchInterpVal;

		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS
		#ifdef NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT
		float chEneIIR[2][MASA_FREQUENCY_BANDS]; /* independent of the format. MASA bands are suitable for the task and readily available in ROM. */
		float procChEneIIR[2][MASA_FREQUENCY_BANDS];
		#else
		float chEneIIR[2][CLDFB_NO_CHANNELS_MAX];
		float procChEneIIR[2][CLDFB_NO_CHANNELS_MAX];
		#endif
		#endif

		int16_t shd_rot_max_order;
		ivas_orient_trk_state_t *OrientationTracker;