From 5e493f123365edc6a355ce6b07dcbeeea161c5c0 Mon Sep 17 00:00:00 2001 From: azmill Date: Wed, 9 Aug 2023 17:06:23 +1000 Subject: [PATCH 1/6] Removing comments and code that is no longer needed for SBA --- lib_com/ivas_cnst.h | 2 +- lib_dec/ivas_dirac_dec.c | 5 ----- lib_enc/ivas_spar_encoder.c | 4 ---- lib_enc/ivas_spar_md_enc.c | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 6d89e222ec..2db0dcaba3 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -1088,7 +1088,7 @@ typedef enum #define IVAS_SPAR_BR_TABLE_LEN 20 -/* TD decorr */ // ToDo: not all 16CH are currently supported -> to be revisited later +/* TD decorr */ enum { IVAS_TD_DECORR_OUT_1CH = 1, diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c index 491d2f48b6..994d2e2ff7 100644 --- a/lib_dec/ivas_dirac_dec.c +++ b/lib_dec/ivas_dirac_dec.c @@ -466,10 +466,6 @@ static ivas_error ivas_dirac_rend_config( { hDirACRend->num_protos_diff = 1; hDirACRend->num_protos_dir = nchan_transport; - if ( ( st_ivas->sba_planar ) && ( !( st_ivas->ivas_format == SBA_FORMAT ) ) ) // Todo Dolby/FhG refactor: Is this ever true? - { - hDirACRend->num_protos_dir++; - } for ( k = 0; k < min( hDirACRend->num_outputs_dir, hDirACRend->num_protos_dir ); k++ ) { @@ -1878,7 +1874,6 @@ void ivas_dirac_dec_render_sf( { md_idx = hSpatParamRendCom->render_to_md_map[slot_idx_start]; } - /* ToDo: Another workaround for self test BE */ /* copy parameters into local buffers*/ if ( hDirAC->hConfig->dec_param_estim == FALSE ) diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index b7b5480952..b29e4ac29b 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -954,10 +954,6 @@ static ivas_error ivas_spar_enc_process( } else { - /* IVAS_fmToDo: This AGC on/off bit should be removed when the command line option to force enable/disable AGC is - * removed. - * On the decoder side, ivas_agc_enc_get_flag could be used instead to determine if AGC is on or not. The - * ivas_agc_enc_get_flag function should be moved to ivas_agc_com.c and renamed when this occurs. */ push_next_indice( hMetaData, 0, 1 ); } } diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc.c index e07f51e86c..e642de5172 100644 --- a/lib_enc/ivas_spar_md_enc.c +++ b/lib_enc/ivas_spar_md_enc.c @@ -45,7 +45,6 @@ /*------------------------------------------------------------------------------------------* * PreProcessor *------------------------------------------------------------------------------------------*/ -#define IVAS_MAX_MD_BYTES ( 1000 ) // ToDo: not used static const float pr_boost_range[2] = { 0.1f, 0.4f }; -- GitLab From 229e83588944085e3750d20eb2df16587ff3e05d Mon Sep 17 00:00:00 2001 From: azmill Date: Thu, 10 Aug 2023 10:12:58 +1000 Subject: [PATCH 2/6] More cleanup, removing the 16ch td decorr unused configs. --- lib_com/ivas_cnst.h | 15 ++------------- lib_com/ivas_td_decorr.c | 13 ------------- lib_enc/ivas_spar_encoder.c | 4 ++++ 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 2db0dcaba3..1756156008 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -1095,22 +1095,11 @@ enum IVAS_TD_DECORR_OUT_2CH, IVAS_TD_DECORR_OUT_3CH, IVAS_TD_DECORR_OUT_4CH, - IVAS_TD_DECORR_OUT_5CH, - IVAS_TD_DECORR_OUT_6CH, - IVAS_TD_DECORR_OUT_7CH, - IVAS_TD_DECORR_OUT_8CH, - IVAS_TD_DECORR_OUT_9CH, - IVAS_TD_DECORR_OUT_10CH, - IVAS_TD_DECORR_OUT_11CH, - IVAS_TD_DECORR_OUT_12CH, - IVAS_TD_DECORR_OUT_13CH, - IVAS_TD_DECORR_OUT_14CH, - IVAS_TD_DECORR_OUT_15CH, - IVAS_TD_DECORR_OUT_16CH + IVAS_TD_DECORR_OUT_5CH }; #define IVAS_SPAR_MAX_DMX_CHS 4 -#define IVAS_MAX_DECORR_CHS IVAS_TD_DECORR_OUT_15CH +#define IVAS_MAX_DECORR_CHS IVAS_TD_DECORR_OUT_5CH #define IVAS_MAX_DECORR_APD_SECTIONS 16 #define IVAS_APD_2_SECT 2 #define IVAS_APD_4_SECT 4 diff --git a/lib_com/ivas_td_decorr.c b/lib_com/ivas_td_decorr.c index 4bf813ac35..4ed78f5c55 100644 --- a/lib_com/ivas_td_decorr.c +++ b/lib_com/ivas_td_decorr.c @@ -328,21 +328,8 @@ static int16_t ivas_get_APD_filt_orders( break; case IVAS_TD_DECORR_OUT_5CH: - case IVAS_TD_DECORR_OUT_6CH: - case IVAS_TD_DECORR_OUT_7CH: - case IVAS_TD_DECORR_OUT_8CH: num_apd_sections = IVAS_APD_8_SECT; break; - case IVAS_TD_DECORR_OUT_9CH: - case IVAS_TD_DECORR_OUT_10CH: - case IVAS_TD_DECORR_OUT_11CH: - case IVAS_TD_DECORR_OUT_12CH: - case IVAS_TD_DECORR_OUT_13CH: - case IVAS_TD_DECORR_OUT_14CH: - case IVAS_TD_DECORR_OUT_15CH: - case IVAS_TD_DECORR_OUT_16CH: - num_apd_sections = IVAS_APD_16_SECT; - break; default: assert( !"Invalid num out chans" ); break; diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index b29e4ac29b..b7b5480952 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -954,6 +954,10 @@ static ivas_error ivas_spar_enc_process( } else { + /* IVAS_fmToDo: This AGC on/off bit should be removed when the command line option to force enable/disable AGC is + * removed. + * On the decoder side, ivas_agc_enc_get_flag could be used instead to determine if AGC is on or not. The + * ivas_agc_enc_get_flag function should be moved to ivas_agc_com.c and renamed when this occurs. */ push_next_indice( hMetaData, 0, 1 ); } } -- GitLab From d3edb2e545a766ffc2944b50046d3e9a203c647c Mon Sep 17 00:00:00 2001 From: azmill Date: Fri, 11 Aug 2023 00:20:09 +1000 Subject: [PATCH 3/6] Adding back in the 16ch macros to see if it fixes tests --- lib_com/ivas_cnst.h | 17 ++++++++++++++--- lib_com/ivas_td_decorr.c | 14 +++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 3571de218e..337b6cb8bc 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -1100,18 +1100,29 @@ typedef enum #define IVAS_SPAR_BR_TABLE_LEN 20 -/* TD decorr */ +/* TD decorr */ // ToDo: not all 16CH are currently supported -> to be revisited later enum { IVAS_TD_DECORR_OUT_1CH = 1, IVAS_TD_DECORR_OUT_2CH, IVAS_TD_DECORR_OUT_3CH, IVAS_TD_DECORR_OUT_4CH, - IVAS_TD_DECORR_OUT_5CH + IVAS_TD_DECORR_OUT_5CH, + IVAS_TD_DECORR_OUT_6CH, + IVAS_TD_DECORR_OUT_7CH, + IVAS_TD_DECORR_OUT_8CH, + IVAS_TD_DECORR_OUT_9CH, + IVAS_TD_DECORR_OUT_10CH, + IVAS_TD_DECORR_OUT_11CH, + IVAS_TD_DECORR_OUT_12CH, + IVAS_TD_DECORR_OUT_13CH, + IVAS_TD_DECORR_OUT_14CH, + IVAS_TD_DECORR_OUT_15CH, + IVAS_TD_DECORR_OUT_16CH }; #define IVAS_SPAR_MAX_DMX_CHS 4 -#define IVAS_MAX_DECORR_CHS IVAS_TD_DECORR_OUT_5CH +#define IVAS_MAX_DECORR_CHS IVAS_TD_DECORR_OUT_16CH #define IVAS_MAX_DECORR_APD_SECTIONS 16 #define IVAS_APD_2_SECT 2 #define IVAS_APD_4_SECT 4 diff --git a/lib_com/ivas_td_decorr.c b/lib_com/ivas_td_decorr.c index 4ed78f5c55..ee7cfbcbea 100644 --- a/lib_com/ivas_td_decorr.c +++ b/lib_com/ivas_td_decorr.c @@ -326,10 +326,22 @@ static int16_t ivas_get_APD_filt_orders( case IVAS_TD_DECORR_OUT_4CH: num_apd_sections = IVAS_APD_4_SECT; break; - case IVAS_TD_DECORR_OUT_5CH: + case IVAS_TD_DECORR_OUT_6CH: + case IVAS_TD_DECORR_OUT_7CH: + case IVAS_TD_DECORR_OUT_8CH: num_apd_sections = IVAS_APD_8_SECT; break; + case IVAS_TD_DECORR_OUT_9CH: + case IVAS_TD_DECORR_OUT_10CH: + case IVAS_TD_DECORR_OUT_11CH: + case IVAS_TD_DECORR_OUT_12CH: + case IVAS_TD_DECORR_OUT_13CH: + case IVAS_TD_DECORR_OUT_14CH: + case IVAS_TD_DECORR_OUT_15CH: + case IVAS_TD_DECORR_OUT_16CH: + num_apd_sections = IVAS_APD_16_SECT; + break; default: assert( !"Invalid num out chans" ); break; -- GitLab From 42bd76ed641c63024087fc98ecf7a5663a82d9c4 Mon Sep 17 00:00:00 2001 From: azmill Date: Fri, 11 Aug 2023 09:51:27 +1000 Subject: [PATCH 4/6] Trying this code removal change again with latest main merged in --- lib_com/ivas_cnst.h | 15 ++------------- lib_com/ivas_td_decorr.c | 13 ------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 337b6cb8bc..66c923d62c 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -1107,22 +1107,11 @@ enum IVAS_TD_DECORR_OUT_2CH, IVAS_TD_DECORR_OUT_3CH, IVAS_TD_DECORR_OUT_4CH, - IVAS_TD_DECORR_OUT_5CH, - IVAS_TD_DECORR_OUT_6CH, - IVAS_TD_DECORR_OUT_7CH, - IVAS_TD_DECORR_OUT_8CH, - IVAS_TD_DECORR_OUT_9CH, - IVAS_TD_DECORR_OUT_10CH, - IVAS_TD_DECORR_OUT_11CH, - IVAS_TD_DECORR_OUT_12CH, - IVAS_TD_DECORR_OUT_13CH, - IVAS_TD_DECORR_OUT_14CH, - IVAS_TD_DECORR_OUT_15CH, - IVAS_TD_DECORR_OUT_16CH + IVAS_TD_DECORR_OUT_5CH }; #define IVAS_SPAR_MAX_DMX_CHS 4 -#define IVAS_MAX_DECORR_CHS IVAS_TD_DECORR_OUT_16CH +#define IVAS_MAX_DECORR_CHS IVAS_TD_DECORR_OUT_5CH #define IVAS_MAX_DECORR_APD_SECTIONS 16 #define IVAS_APD_2_SECT 2 #define IVAS_APD_4_SECT 4 diff --git a/lib_com/ivas_td_decorr.c b/lib_com/ivas_td_decorr.c index ee7cfbcbea..618211f824 100644 --- a/lib_com/ivas_td_decorr.c +++ b/lib_com/ivas_td_decorr.c @@ -327,21 +327,8 @@ static int16_t ivas_get_APD_filt_orders( num_apd_sections = IVAS_APD_4_SECT; break; case IVAS_TD_DECORR_OUT_5CH: - case IVAS_TD_DECORR_OUT_6CH: - case IVAS_TD_DECORR_OUT_7CH: - case IVAS_TD_DECORR_OUT_8CH: num_apd_sections = IVAS_APD_8_SECT; break; - case IVAS_TD_DECORR_OUT_9CH: - case IVAS_TD_DECORR_OUT_10CH: - case IVAS_TD_DECORR_OUT_11CH: - case IVAS_TD_DECORR_OUT_12CH: - case IVAS_TD_DECORR_OUT_13CH: - case IVAS_TD_DECORR_OUT_14CH: - case IVAS_TD_DECORR_OUT_15CH: - case IVAS_TD_DECORR_OUT_16CH: - num_apd_sections = IVAS_APD_16_SECT; - break; default: assert( !"Invalid num out chans" ); break; -- GitLab From 7b89b5d9dfefe201b40ddeb30560b879da23fc81 Mon Sep 17 00:00:00 2001 From: azmill Date: Fri, 11 Aug 2023 11:04:20 +1000 Subject: [PATCH 5/6] The number of decorr chs should be 8, this fixes it --- lib_com/ivas_cnst.h | 9 ++++++--- lib_com/ivas_td_decorr.c | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 66c923d62c..a6ad6440c9 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -1100,18 +1100,21 @@ typedef enum #define IVAS_SPAR_BR_TABLE_LEN 20 -/* TD decorr */ // ToDo: not all 16CH are currently supported -> to be revisited later +/* TD decorr */ enum { IVAS_TD_DECORR_OUT_1CH = 1, IVAS_TD_DECORR_OUT_2CH, IVAS_TD_DECORR_OUT_3CH, IVAS_TD_DECORR_OUT_4CH, - IVAS_TD_DECORR_OUT_5CH + IVAS_TD_DECORR_OUT_5CH, + IVAS_TD_DECORR_OUT_6CH, + IVAS_TD_DECORR_OUT_7CH, + IVAS_TD_DECORR_OUT_8CH }; #define IVAS_SPAR_MAX_DMX_CHS 4 -#define IVAS_MAX_DECORR_CHS IVAS_TD_DECORR_OUT_5CH +#define IVAS_MAX_DECORR_CHS IVAS_TD_DECORR_OUT_8CH #define IVAS_MAX_DECORR_APD_SECTIONS 16 #define IVAS_APD_2_SECT 2 #define IVAS_APD_4_SECT 4 diff --git a/lib_com/ivas_td_decorr.c b/lib_com/ivas_td_decorr.c index 618211f824..5380e75b35 100644 --- a/lib_com/ivas_td_decorr.c +++ b/lib_com/ivas_td_decorr.c @@ -315,6 +315,7 @@ static int16_t ivas_get_APD_filt_orders( int16_t i; int16_t num_apd_sections = 0; float sum_R, R[IVAS_MAX_DECORR_APD_SECTIONS]; + printf("Och %d\n", num_out_chans); switch ( num_out_chans ) { @@ -327,6 +328,9 @@ static int16_t ivas_get_APD_filt_orders( num_apd_sections = IVAS_APD_4_SECT; break; case IVAS_TD_DECORR_OUT_5CH: + case IVAS_TD_DECORR_OUT_6CH: + case IVAS_TD_DECORR_OUT_7CH: + case IVAS_TD_DECORR_OUT_8CH: num_apd_sections = IVAS_APD_8_SECT; break; default: @@ -345,7 +349,7 @@ static int16_t ivas_get_APD_filt_orders( { APD_filt_orders[i] = (int16_t) ceil( output_Fs * IVAS_DECORR_PARM_APD_TAU * R[i] / sum_R ); } - + printf("NUM_APD: %d\n", num_apd_sections); return num_apd_sections; } -- GitLab From 92b0c72c8aac894f41d2de6986e910fab7fd2f7b Mon Sep 17 00:00:00 2001 From: azmill Date: Fri, 11 Aug 2023 11:19:29 +1000 Subject: [PATCH 6/6] Fixing formatting --- lib_com/ivas_td_decorr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib_com/ivas_td_decorr.c b/lib_com/ivas_td_decorr.c index 5380e75b35..a1af629f0c 100644 --- a/lib_com/ivas_td_decorr.c +++ b/lib_com/ivas_td_decorr.c @@ -315,7 +315,6 @@ static int16_t ivas_get_APD_filt_orders( int16_t i; int16_t num_apd_sections = 0; float sum_R, R[IVAS_MAX_DECORR_APD_SECTIONS]; - printf("Och %d\n", num_out_chans); switch ( num_out_chans ) { @@ -349,7 +348,6 @@ static int16_t ivas_get_APD_filt_orders( { APD_filt_orders[i] = (int16_t) ceil( output_Fs * IVAS_DECORR_PARM_APD_TAU * R[i] / sum_R ); } - printf("NUM_APD: %d\n", num_apd_sections); return num_apd_sections; } -- GitLab