Loading lib_com/options.h +0 −1 Original line number Diff line number Diff line Loading @@ -188,7 +188,6 @@ //#define SPIT_ABS_SCALING_INTERP //#define USE_DOLBY_HRTFS_WITH_LIB_REND_HOA3 Loading lib_rend/ivas_splitRendererPost.c +0 −34 Original line number Diff line number Diff line Loading @@ -1128,10 +1128,6 @@ static void interpolate_pred_matrix( float mix_mat_im1[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; float mix_mat_re2[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; float mix_mat_im2[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; #ifdef SPIT_ABS_SCALING_INTERP float abs1, abs2; float mix_mat_abs[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; #endif for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { Loading Loading @@ -1172,20 +1168,6 @@ static void interpolate_pred_matrix( } } #ifdef SPIT_ABS_SCALING_INTERP for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { for ( ch_idx2 = 0; ch_idx2 < BINAURAL_CHANNELS; ch_idx2++ ) { IVAS_CALCULATE_ABS( mix_mat_re1[ch_idx1][ch_idx2], mix_mat_im1[ch_idx1][ch_idx2], abs1 ); IVAS_CALCULATE_ABS( mix_mat_re2[ch_idx1][ch_idx2], mix_mat_im2[ch_idx1][ch_idx2], abs2 ); diff = abs1 - abs2; mix_mat_abs[ch_idx1][ch_idx2] = abs1 - ( diff * interp_fact ); mix_mat_abs[ch_idx1][ch_idx2] = fabsf( mix_mat_abs[ch_idx1][ch_idx2] ); } } #endif for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { for ( ch_idx2 = 0; ch_idx2 < BINAURAL_CHANNELS; ch_idx2++ ) Loading @@ -1198,22 +1180,6 @@ static void interpolate_pred_matrix( } } #ifdef SPIT_ABS_SCALING_INTERP for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { for ( ch_idx2 = 0; ch_idx2 < BINAURAL_CHANNELS; ch_idx2++ ) { IVAS_CALCULATE_ABS( mat_re[ch_idx1][ch_idx2], mat_im[ch_idx1][ch_idx2], abs1 ); if ( abs1 > 1e-10 ) { abs1 = mix_mat_abs[ch_idx1][ch_idx2] / abs1; mat_re[ch_idx1][ch_idx2] = mat_re[ch_idx1][ch_idx2] * abs1; mat_im[ch_idx1][ch_idx2] = mat_im[ch_idx1][ch_idx2] * abs1; } } } #endif return; } Loading Loading
lib_com/options.h +0 −1 Original line number Diff line number Diff line Loading @@ -188,7 +188,6 @@ //#define SPIT_ABS_SCALING_INTERP //#define USE_DOLBY_HRTFS_WITH_LIB_REND_HOA3 Loading
lib_rend/ivas_splitRendererPost.c +0 −34 Original line number Diff line number Diff line Loading @@ -1128,10 +1128,6 @@ static void interpolate_pred_matrix( float mix_mat_im1[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; float mix_mat_re2[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; float mix_mat_im2[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; #ifdef SPIT_ABS_SCALING_INTERP float abs1, abs2; float mix_mat_abs[BINAURAL_CHANNELS][BINAURAL_CHANNELS]; #endif for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { Loading Loading @@ -1172,20 +1168,6 @@ static void interpolate_pred_matrix( } } #ifdef SPIT_ABS_SCALING_INTERP for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { for ( ch_idx2 = 0; ch_idx2 < BINAURAL_CHANNELS; ch_idx2++ ) { IVAS_CALCULATE_ABS( mix_mat_re1[ch_idx1][ch_idx2], mix_mat_im1[ch_idx1][ch_idx2], abs1 ); IVAS_CALCULATE_ABS( mix_mat_re2[ch_idx1][ch_idx2], mix_mat_im2[ch_idx1][ch_idx2], abs2 ); diff = abs1 - abs2; mix_mat_abs[ch_idx1][ch_idx2] = abs1 - ( diff * interp_fact ); mix_mat_abs[ch_idx1][ch_idx2] = fabsf( mix_mat_abs[ch_idx1][ch_idx2] ); } } #endif for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { for ( ch_idx2 = 0; ch_idx2 < BINAURAL_CHANNELS; ch_idx2++ ) Loading @@ -1198,22 +1180,6 @@ static void interpolate_pred_matrix( } } #ifdef SPIT_ABS_SCALING_INTERP for ( ch_idx1 = 0; ch_idx1 < BINAURAL_CHANNELS; ch_idx1++ ) { for ( ch_idx2 = 0; ch_idx2 < BINAURAL_CHANNELS; ch_idx2++ ) { IVAS_CALCULATE_ABS( mat_re[ch_idx1][ch_idx2], mat_im[ch_idx1][ch_idx2], abs1 ); if ( abs1 > 1e-10 ) { abs1 = mix_mat_abs[ch_idx1][ch_idx2] / abs1; mat_re[ch_idx1][ch_idx2] = mat_re[ch_idx1][ch_idx2] * abs1; mat_im[ch_idx1][ch_idx2] = mat_im[ch_idx1][ch_idx2] * abs1; } } } #endif return; } Loading