From de9f35a8144c71c666c45c119b99ac3f706b5c57 Mon Sep 17 00:00:00 2001 From: Shikha Shetgeri <100861@ittiam.com> Date: Fri, 10 Mar 2023 14:14:11 +0530 Subject: [PATCH 1/6] 'fix_331 enabled for all the bitrates and sba_modes --- lib_com/ivas_cov_smooth.c | 9 ++++++++- lib_com/options.h | 1 + lib_enc/ivas_spar_encoder.c | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index 57f74fb70e..874abab034 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -54,13 +54,15 @@ static void ivas_set_up_cov_smoothing( const float max_update_rate, const int16_t min_pool_size #ifdef COV_SMOOTH_TUNING +#ifndef FIX_331_ALL_BRS , const int16_t nchan_inp /* i : number of input channels */ #endif +#endif ) { int16_t j, k; - +#ifndef FIX_331_ALL_BRS #ifdef COV_SMOOTH_TUNING if ( nchan_inp <= FOA_CHANNELS ) { @@ -87,6 +89,8 @@ static void ivas_set_up_cov_smoothing( } else { +#endif +#endif for ( j = 0; j < pFb->filterbank_num_bands; j++ ) { float update_factor; @@ -106,6 +110,7 @@ static void ivas_set_up_cov_smoothing( hCovState->pSmoothing_factor[j] = max_update_rate; } } +#ifndef FIX_331_ALL_BRS } #endif hCovState->prior_bank_idx = -1; @@ -153,9 +158,11 @@ ivas_error ivas_spar_covar_smooth_enc_open( } ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size +#ifndef FIX_331_ALL_BRS #ifdef COV_SMOOTH_TUNING , nchan_inp +#endif #endif ); diff --git a/lib_com/options.h b/lib_com/options.h index 7b0f0625b9..f0a013e8d2 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -158,6 +158,7 @@ #define SBA_HPF_TUNING_ENC /*#define SBA_HPF_TUNING_DEC*/ #define SMOOTH_WITH_TRANS_DET +#define FIX_331_ALL_BRS #endif #define BINAURALIZATION_DELAY_REPORT /* VA: Issue 255 - Changes the way the decoder delay is reported */ diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index f1e87a59ba..903faa02ff 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -421,10 +421,12 @@ static ivas_error ivas_spar_enc_process( #ifdef SMOOTH_WITH_TRANS_DET ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame, transient_det ); +#ifndef FIX_331_ALL_BRS if ( sba_order == 1 ) { transient_det[1] = transient_det[0]; } +#endif #else transient_det = ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame ); #endif -- GitLab From f80b6d81c88129c6d9897ddfdb55fb929f58470d Mon Sep 17 00:00:00 2001 From: Shikha Shetgeri <100861@ittiam.com> Date: Fri, 10 Mar 2023 16:43:13 +0530 Subject: [PATCH 2/6] minor changes done --- lib_com/ivas_cov_smooth.c | 4 ++-- lib_com/options.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index 874abab034..f55c89f9dd 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -158,10 +158,10 @@ ivas_error ivas_spar_covar_smooth_enc_open( } ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size -#ifndef FIX_331_ALL_BRS #ifdef COV_SMOOTH_TUNING +#ifndef FIX_331_ALL_BRS , - nchan_inp + nchan_inp #endif #endif ); diff --git a/lib_com/options.h b/lib_com/options.h index f0a013e8d2..3b1aba72c4 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -158,7 +158,7 @@ #define SBA_HPF_TUNING_ENC /*#define SBA_HPF_TUNING_DEC*/ #define SMOOTH_WITH_TRANS_DET -#define FIX_331_ALL_BRS +#define FIX_331_ALL_BRS /*Enable the fix_331 across all the bitrates and sba modes*/ #endif #define BINAURALIZATION_DELAY_REPORT /* VA: Issue 255 - Changes the way the decoder delay is reported */ -- GitLab From 7b1e8d8a7f0c04edd35f72a9fff351d8d5a193bd Mon Sep 17 00:00:00 2001 From: Shikha Shetgeri <100861@ittiam.com> Date: Fri, 21 Apr 2023 14:42:38 +0530 Subject: [PATCH 3/6] pipeline fixes - set 1 --- lib_com/ivas_cov_smooth.c | 11 ++++------- lib_com/options.h | 2 +- lib_enc/ivas_spar_encoder.c | 8 ++++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index 0df17afc1e..1a7af5d68f 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -51,17 +51,14 @@ static void ivas_set_up_cov_smoothing( ivas_filterbank_t *pFb, const float max_update_rate, const int16_t min_pool_size -#ifdef COV_SMOOTH_TUNING #ifndef FIX_331_ALL_BRS , const int16_t nchan_inp /* i : number of input channels */ #endif -#endif ) { int16_t j, k; #ifndef FIX_331_ALL_BRS -#ifdef COV_SMOOTH_TUNING if ( nchan_inp <= FOA_CHANNELS ) { for ( j = 0; j < pFb->filterbank_num_bands; j++ ) @@ -84,7 +81,6 @@ static void ivas_set_up_cov_smoothing( } else { -#endif #endif for ( j = 0; j < pFb->filterbank_num_bands; j++ ) { @@ -105,6 +101,9 @@ static void ivas_set_up_cov_smoothing( hCovState->pSmoothing_factor[j] = max_update_rate; } } +#ifndef FIX_331_ALL_BRS + } +#endif hCovState->prior_bank_idx = -1; return; @@ -150,11 +149,9 @@ ivas_error ivas_spar_covar_smooth_enc_open( } ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size -#ifdef COV_SMOOTH_TUNING #ifndef FIX_331_ALL_BRS , - nchan_inp -#endif + nchan_inp #endif ); diff --git a/lib_com/options.h b/lib_com/options.h index 7d195c3044..aafa81407a 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -144,7 +144,7 @@ #define FIX_103_RA_PARAMS_PARAM_BIN_REND /* Issue 103: Digest room acoustics parameters for Parametric Binaural Renderer*/ /*#define SBA_HPF_TUNING_DEC*/ #define SMOOTH_WITH_TRANS_DET -//#define FIX_331_ALL_BRS /*Enable the fix_331 across all the bitrates and sba modes*/ +#define FIX_331_ALL_BRS /*Enable the fix_331 across all the bitrates and sba modes*/ #define FIX_350_MASA_DELAY_COMP /* Nokia: Issue 350: MASA audio/meta delay compensation */ #define FIX_MDCT_BASED_BWD /* FhG: fixes for BWD for issues with reaction to transients for MDCT-stereo and MCT */ diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index da10935a2c..f3ccf362f7 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -421,7 +421,7 @@ static ivas_error ivas_spar_enc_process( ivas_total_brate = hEncoderConfig->ivas_total_brate; num_del_samples = hSpar->hFbMixer->fb_cfg->fb_latency; - input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC ); + input_frame = ( int16_t )( input_Fs / FRAMES_PER_SEC ); sba_order = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); nchan_inp = ivas_sba_get_nchan_metadata( sba_order ); assert( nchan_inp <= hEncoderConfig->nchan_inp ); @@ -442,9 +442,9 @@ static ivas_error ivas_spar_enc_process( transient_det[1] = transient_det[0]; } #endif -//#else -// transient_det = ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame ); -//#endif + //#else + // transient_det = ivas_transient_det_process( hSpar->hTranDet, data_f[0], input_frame ); + //#endif /* store previous input samples for W in local buffer */ assert( num_del_samples <= IVAS_FB_1MS_48K_SAMP ); -- GitLab From e406e99b6313f679c1a42bb659f4da9e11f8806e Mon Sep 17 00:00:00 2001 From: Shikha Shetgeri <100861@ittiam.com> Date: Fri, 21 Apr 2023 17:41:42 +0530 Subject: [PATCH 4/6] clang format fix --- lib_enc/ivas_spar_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index f3ccf362f7..bc246ea9ce 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -421,7 +421,7 @@ static ivas_error ivas_spar_enc_process( ivas_total_brate = hEncoderConfig->ivas_total_brate; num_del_samples = hSpar->hFbMixer->fb_cfg->fb_latency; - input_frame = ( int16_t )( input_Fs / FRAMES_PER_SEC ); + input_frame = (int16_t) ( input_Fs / FRAMES_PER_SEC ); sba_order = min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ); nchan_inp = ivas_sba_get_nchan_metadata( sba_order ); assert( nchan_inp <= hEncoderConfig->nchan_inp ); -- GitLab From b34123c96249af4e2e878878b1c95a53a1d66782 Mon Sep 17 00:00:00 2001 From: Shikha Shetgeri <100861@ittiam.com> Date: Tue, 2 May 2023 11:27:53 +0530 Subject: [PATCH 5/6] pipeline fixes set-1 --- lib_com/ivas_cov_smooth.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index 5b38af8cb2..d3d03768ee 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -50,8 +50,11 @@ static void ivas_set_up_cov_smoothing( ivas_cov_smooth_state_t *hCovState, ivas_filterbank_t *pFb, const float max_update_rate, - const int16_t min_pool_size, + const int16_t min_pool_size +#ifndef FIX_331_ALL_BRS + , const int16_t nchan_inp /* i : number of input channels */ +#endif #ifdef LBR_SBA_EXTRA_COV_SMOOTH , const int32_t ivas_total_brate @@ -195,9 +198,17 @@ ivas_error ivas_spar_covar_smooth_enc_open( } #ifdef LBR_SBA_EXTRA_COV_SMOOTH - ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, nchan_inp, ivas_total_brate ); + ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size +#ifndef FIX_331_ALL_BRS + , nchan_inp +#endif + , ivas_total_brate ); #else - ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, nchan_inp ); + ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, +#ifndef FIX_331_ALL_BRS + , nchan_inp +#endif + ); #endif *hCovState_out = hCovState; -- GitLab From 09a83dbac46da5ae2f9d642759927ef48a7b1e07 Mon Sep 17 00:00:00 2001 From: Shikha Shetgeri <100861@ittiam.com> Date: Tue, 2 May 2023 11:39:10 +0530 Subject: [PATCH 6/6] clang-format fixes --- lib_com/ivas_cov_smooth.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth.c index d3d03768ee..bddafdc98f 100644 --- a/lib_com/ivas_cov_smooth.c +++ b/lib_com/ivas_cov_smooth.c @@ -200,13 +200,15 @@ ivas_error ivas_spar_covar_smooth_enc_open( #ifdef LBR_SBA_EXTRA_COV_SMOOTH ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size #ifndef FIX_331_ALL_BRS - , nchan_inp + , + nchan_inp #endif - , ivas_total_brate ); + , + ivas_total_brate ); #else - ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, + ivas_set_up_cov_smoothing( hCovState, pFb, cov_smooth_cfg->max_update_rate, cov_smooth_cfg->min_pool_size, #ifndef FIX_331_ALL_BRS - , nchan_inp + , nchan_inp #endif ); #endif -- GitLab