From a2c193c4c74e9028f32c3f4fcf57428195392031 Mon Sep 17 00:00:00 2001 From: Shanush Prema Thasarathan Date: Mon, 27 Feb 2023 10:29:04 +1100 Subject: [PATCH 1/2] Fix asserts so that they actually trigger, and clarify the use of zero_vert_comp in sba_getTCs --- lib_com/ivas_entropy_coder_common.c | 8 ++++---- lib_dec/ivas_cpe_dec.c | 2 +- lib_enc/ivas_mct_enc.c | 2 +- lib_enc/ivas_sba_enc.c | 5 ++++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib_com/ivas_entropy_coder_common.c b/lib_com/ivas_entropy_coder_common.c index 3b4b0142dc..a2fa26cad9 100644 --- a/lib_com/ivas_entropy_coder_common.c +++ b/lib_com/ivas_entropy_coder_common.c @@ -127,7 +127,7 @@ int16_t ivas_map_num_pred_r_to_idx( pred_r_to_idx = PRED_Q_31; break; default: - assert( "Forbidden value for prediction quantization strategy index" ); + assert( !"Forbidden value for prediction quantization strategy index" ); break; } } @@ -145,7 +145,7 @@ int16_t ivas_map_num_pred_r_to_idx( pred_r_to_idx = PRED_Q_21_ACTIVE_W; break; default: - assert( "Forbidden value for prediction quantization strategy index" ); + assert( !"Forbidden value for prediction quantization strategy index" ); break; } } @@ -179,7 +179,7 @@ int16_t ivas_map_num_drct_r_to_idx( drct_r_to_idx = DRCT_Q_11; break; default: - assert( "Forbidden value for DRCT quantization strategy index" ); + assert( !"Forbidden value for DRCT quantization strategy index" ); break; } return drct_r_to_idx; @@ -217,7 +217,7 @@ int16_t ivas_map_num_decd_r_to_idx( decd_r_to_idx = DECD_Q_11; break; default: - assert( "Forbidden value for DECD quantization strategy index" ); + assert( !"Forbidden value for DECD quantization strategy index" ); break; } diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c index e96df0d637..ddd4ae363f 100644 --- a/lib_dec/ivas_cpe_dec.c +++ b/lib_dec/ivas_cpe_dec.c @@ -963,7 +963,7 @@ static void read_stereo_mode_and_bwidth( hCPE->element_mode = IVAS_CPE_MDCT; break; case SID_SBA_1TC: - assert( "Forbidden value for SID format in CPE (SBA 1TC), should have already been adressed earlier" ); + assert( !"Forbidden value for SID format in CPE (SBA 1TC), should have already been adressed earlier" ); break; case SID_MASA_1TC: hCPE->element_mode = IVAS_SCE; diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c index 5e6511fce6..eb7975c1c1 100644 --- a/lib_enc/ivas_mct_enc.c +++ b/lib_enc/ivas_mct_enc.c @@ -130,7 +130,7 @@ ivas_error ivas_mct_enc( #ifdef DEBUG_FORCE_MCT_CP if ( ivas_format == MC_FORMAT ) { - assert( "Debugging switch works only with SBA modes" ); + assert( !"Debugging switch works only with SBA modes" ); } #endif diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c index cabd6fddde..2af2cf76fa 100644 --- a/lib_enc/ivas_sba_enc.c +++ b/lib_enc/ivas_sba_enc.c @@ -58,7 +58,10 @@ void ivas_sba_getTCs( const int16_t input_frame /* i : frame length */ ) { - ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar, input_frame ); + if ( st_ivas->hEncoderConfig->sba_planar ) + { + ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar, input_frame ); + } st_ivas->nchan_transport = ivas_get_sba_num_TCs( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->sba_analysis_order ); -- GitLab From 0060f8a4c81abcaff947ef415ee767a01f1d2a6c Mon Sep 17 00:00:00 2001 From: Shanush Prema Thasarathan Date: Mon, 27 Feb 2023 14:07:22 +1100 Subject: [PATCH 2/2] Remove redunant call to ivas_sba_zero_vert_comp --- lib_enc/ivas_spar_encoder.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c index b13ad3077f..f1e87a59ba 100644 --- a/lib_enc/ivas_spar_encoder.c +++ b/lib_enc/ivas_spar_encoder.c @@ -343,11 +343,6 @@ ivas_error ivas_spar_enc( return error; } - if ( hEncoderConfig->sba_planar ) - { - ivas_sba_zero_vert_comp( data_f, st_ivas->sba_analysis_order, hEncoderConfig->sba_planar, input_frame ); // TODO tmu: do we need a second call to this function ? - } - *nb_bits_metadata = hMetaData->nb_bits_tot; /* Force IVAS front pre-proc decision for higher bitrates */ -- GitLab