From d1f23ab2c71904eff6f109752b6576b25d59cbac Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 2 Feb 2023 16:33:41 +0100 Subject: [PATCH 01/16] [cleanup] accept SBA_BR_SWITCHING_COMPLEXITY_FIX --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 5dddf236ea..af3057cf38 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -144,7 +144,6 @@ #define SBA_BR_SWITCHING /* Issue 114: Changes for SBA bit rate switching with reconfiguration for bitrates with same number of transport channels*/ #ifdef SBA_BR_SWITCHING #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ -#define SBA_BR_SWITCHING_COMPLEXITY_FIX /* VA: fix complexity overhead */ #endif #define FIX_I59_DELAY_ROUNDING /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */ #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ -- GitLab From b850b8c6aa926593fee667320e2e13612bed644c Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Thu, 2 Feb 2023 16:35:04 +0100 Subject: [PATCH 02/16] [cleanup] accept FIX_I59_DELAY_ROUNDING --- lib_com/options.h | 1 - lib_dec/lib_dec.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index af3057cf38..012b912316 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -145,7 +145,6 @@ #ifdef SBA_BR_SWITCHING #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ #endif -#define FIX_I59_DELAY_ROUNDING /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */ #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ #define FIX_245_RANGE_CODER_VOIP_MSAN /* Issue 245: fix use-of-uninitialized-value in range coder in VoIP mode */ #define REND_CFG_LFE /* Issue 110: Configurable LFE handling for external renderer */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index c14d3318a6..038385033a 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -1180,11 +1180,7 @@ ivas_error IVAS_DEC_GetDelay( st_ivas = hIvasDec->st_ivas; hDecoderConfig = st_ivas->hDecoderConfig; -#ifdef FIX_I59_DELAY_ROUNDING *nSamples = (int16_t) roundf( (float) get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->binaural_latency_ns ) * hDecoderConfig->output_Fs / 1000000000.f ); -#else - *nSamples = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->binaural_latency_ns ) ); -#endif *timeScale = hDecoderConfig->output_Fs; -- GitLab From 6ce9f9194f5fbcc507b0b9195134f215f49419b2 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:19:40 +0100 Subject: [PATCH 03/16] [cleanup] accept FIX_245_RANGE_CODER_VOIP_MSAN --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 012b912316..e81460b527 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -146,7 +146,6 @@ #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ #endif #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ -#define FIX_245_RANGE_CODER_VOIP_MSAN /* Issue 245: fix use-of-uninitialized-value in range coder in VoIP mode */ #define REND_CFG_LFE /* Issue 110: Configurable LFE handling for external renderer */ #define FIX_235 /* Issue 235: Deallocation of HR filter memory separately for lib_rend (ROM) and lib_util (from file) */ #define ENV_STAB_FIX /* Contribution 23: HQ envelope stability memory fix */ -- GitLab From 9946c59e62c2d425515253dc015bb9e92b9c1ad8 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:20:16 +0100 Subject: [PATCH 04/16] [cleanup] accept REND_CFG_LFE --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index e81460b527..54bd357982 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -146,7 +146,6 @@ #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ #endif #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ -#define REND_CFG_LFE /* Issue 110: Configurable LFE handling for external renderer */ #define FIX_235 /* Issue 235: Deallocation of HR filter memory separately for lib_rend (ROM) and lib_util (from file) */ #define ENV_STAB_FIX /* Contribution 23: HQ envelope stability memory fix */ #define STABILIZE_GIPD /* FhG: Contribution 22: gIPD stabilization */ -- GitLab From 4e6f75f391451b576f45f1f88228b5192b11be48 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:20:55 +0100 Subject: [PATCH 05/16] [cleanup] accept FIX_235 --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 54bd357982..da9081e9c7 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -146,7 +146,6 @@ #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ #endif #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ -#define FIX_235 /* Issue 235: Deallocation of HR filter memory separately for lib_rend (ROM) and lib_util (from file) */ #define ENV_STAB_FIX /* Contribution 23: HQ envelope stability memory fix */ #define STABILIZE_GIPD /* FhG: Contribution 22: gIPD stabilization */ #define FIX_292_VBAP_CALLOC_REMOVAL /* Nokia: Fixes issue 292 by removing the remnant callocs */ -- GitLab From e408f1f68b011e8ec55809f995d1f0212df71b30 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:21:59 +0100 Subject: [PATCH 06/16] [cleanup] accept ENV_STAB_FIX --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index da9081e9c7..36ac64e4c3 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -146,7 +146,6 @@ #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ #endif #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ -#define ENV_STAB_FIX /* Contribution 23: HQ envelope stability memory fix */ #define STABILIZE_GIPD /* FhG: Contribution 22: gIPD stabilization */ #define FIX_292_VBAP_CALLOC_REMOVAL /* Nokia: Fixes issue 292 by removing the remnant callocs */ #define FIX_293_EXT_RENDERER_CLI /* FhG: Fix bugs in external renderer CLI */ -- GitLab From 4eaec4331c7b31bb8c59dfbeb8646340e5cf113c Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:22:30 +0100 Subject: [PATCH 07/16] [cleanup] accept STABILIZE_GIPD --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 36ac64e4c3..4931b69406 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -146,7 +146,6 @@ #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ #endif #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ -#define STABILIZE_GIPD /* FhG: Contribution 22: gIPD stabilization */ #define FIX_292_VBAP_CALLOC_REMOVAL /* Nokia: Fixes issue 292 by removing the remnant callocs */ #define FIX_293_EXT_RENDERER_CLI /* FhG: Fix bugs in external renderer CLI */ #define FIX_268 /* Issue 268: Add low cost dry-run of memory analysis */ -- GitLab From f2aa35aa34ed9a7ee9e9cff27457c2eb5244b445 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:22:58 +0100 Subject: [PATCH 08/16] [cleanup] accept FIX_292_VBAP_CALLOC_REMOVAL --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 4931b69406..a8366f2b71 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -146,7 +146,6 @@ #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ #endif #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ -#define FIX_292_VBAP_CALLOC_REMOVAL /* Nokia: Fixes issue 292 by removing the remnant callocs */ #define FIX_293_EXT_RENDERER_CLI /* FhG: Fix bugs in external renderer CLI */ #define FIX_268 /* Issue 268: Add low cost dry-run of memory analysis */ #define HRTF_BINARY_FILE /* HRTF filters' binary file used for binaural rendering. */ -- GitLab From 046ff638ea7c5c57e8830639fd0be53416e50661 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:23:28 +0100 Subject: [PATCH 09/16] [cleanup] accept FIX_293_EXT_RENDERER_CLI --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index a8366f2b71..a1d18df973 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -146,7 +146,6 @@ #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ #endif #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ -#define FIX_293_EXT_RENDERER_CLI /* FhG: Fix bugs in external renderer CLI */ #define FIX_268 /* Issue 268: Add low cost dry-run of memory analysis */ #define HRTF_BINARY_FILE /* HRTF filters' binary file used for binaural rendering. */ #define LOW_RATE_TRANS_FIX /* Eri: Fix for critical item during transitions */ -- GitLab From 33c45d912203162960b9f2fa64bc09a16cf209ba Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:24:02 +0100 Subject: [PATCH 10/16] [cleanup] accept FIX_268 --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index a1d18df973..31903d6c4f 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -146,7 +146,6 @@ #define SBA_BR_SWITCHING_RECONFIG /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/ #endif #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ -#define FIX_268 /* Issue 268: Add low cost dry-run of memory analysis */ #define HRTF_BINARY_FILE /* HRTF filters' binary file used for binaural rendering. */ #define LOW_RATE_TRANS_FIX /* Eri: Fix for critical item during transitions */ -- GitLab From 792fd02ee0c2536b1bf01f88992720f7555faf57 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:25:09 +0100 Subject: [PATCH 11/16] [cleanup] accept LOW_RATE_TRANS_FIX --- lib_com/options.h | 1 - 1 file changed, 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index 31903d6c4f..9dbf52f5dc 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -147,7 +147,6 @@ #endif #define FIX_FIX_I59 /* Issue 59: small fix concerning LFE delay rounding */ #define HRTF_BINARY_FILE /* HRTF filters' binary file used for binaural rendering. */ -#define LOW_RATE_TRANS_FIX /* Eri: Fix for critical item during transitions */ #define FIX_197_CREND_INTERFACE #define SET_TNS_FLAG_IN_EVERY_FRAME /* FhG: issue 288 - mismatch between encoder and decoder wrt TNS usage in unified stereo with frameloss */ -- GitLab From 56246ac5813133904339490c36283b00fde24e68 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:25:47 +0100 Subject: [PATCH 12/16] [cleanup] accept SET_TNS_FLAG_IN_EVERY_FRAME --- lib_com/options.h | 1 - lib_dec/core_dec_init.c | 2 -- lib_dec/ivas_tcx_core_dec.c | 2 -- lib_enc/ivas_tcx_core_enc.c | 2 -- 4 files changed, 7 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 9dbf52f5dc..2db03a0167 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -149,7 +149,6 @@ #define HRTF_BINARY_FILE /* HRTF filters' binary file used for binaural rendering. */ #define FIX_197_CREND_INTERFACE -#define SET_TNS_FLAG_IN_EVERY_FRAME /* FhG: issue 288 - mismatch between encoder and decoder wrt TNS usage in unified stereo with frameloss */ #define FIX_FOR_TEST /* allows tests to pass using old TD binary file, to be removed after merge*/ #define FIX_299_ISM_BWS /* VA: issue 299 - fix Band-width switching issues in ISM format */ #define FIX_309_PREMPH_MEM_SCE /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/ diff --git a/lib_dec/core_dec_init.c b/lib_dec/core_dec_init.c index ec673cd19c..2ec01aaf61 100644 --- a/lib_dec/core_dec_init.c +++ b/lib_dec/core_dec_init.c @@ -670,13 +670,11 @@ void open_decoder_LPD( st->last_tns_active = 0; st->second_last_tns_active = 0; st->second_last_core = -1; -#ifdef SET_TNS_FLAG_IN_EVERY_FRAME /* TODO: also apply for MCT modes, once issue #24 is solved */ if ( st->hTcxCfg != NULL && !MCT_flag && st->element_mode != EVS_MONO ) { st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); } -#endif if ( hTcxDec != NULL ) { hTcxDec->tcxltp_second_last_pitch = st->old_fpitch; diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec.c index 2a6dcdf82e..785e74cc73 100644 --- a/lib_dec/ivas_tcx_core_dec.c +++ b/lib_dec/ivas_tcx_core_dec.c @@ -96,13 +96,11 @@ void stereo_tcx_init_dec( st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC ); hTcxDec->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_flag, st->element_mode ); st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode ); -#ifdef SET_TNS_FLAG_IN_EVERY_FRAME /* TODO: also apply for MCT modes, once issue #24 is solved */ if ( !MCT_flag && st->element_mode != EVS_MONO ) { st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); } -#endif if ( hTcxLtpDec != NULL ) { hTcxLtpDec->tcxltp = getTcxLtp( st->sr_core ); diff --git a/lib_enc/ivas_tcx_core_enc.c b/lib_enc/ivas_tcx_core_enc.c index cc05a70044..b11435e25b 100644 --- a/lib_enc/ivas_tcx_core_enc.c +++ b/lib_enc/ivas_tcx_core_enc.c @@ -100,12 +100,10 @@ void stereo_tcx_init_enc( st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC ); st->hTcxEnc->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_mode, st->element_mode ); st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_mode, st->mct_chan_mode ); -#ifdef SET_TNS_FLAG_IN_EVERY_FRAME if ( st->element_mode != EVS_MONO ) { st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode ); } -#endif st->core_brate = st->total_brate; -- GitLab From 6759ab5bfdd7578d88cf73c7aa9321a35473c90b Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:26:33 +0100 Subject: [PATCH 13/16] [cleanup] accept FIX_299_ISM_BWS --- lib_com/options.h | 1 - lib_dec/core_switching_dec.c | 2 -- lib_dec/init_dec.c | 2 -- lib_dec/stat_dec.h | 2 -- 4 files changed, 7 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 2db03a0167..967e28c9c3 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -150,7 +150,6 @@ #define FIX_197_CREND_INTERFACE #define FIX_FOR_TEST /* allows tests to pass using old TD binary file, to be removed after merge*/ -#define FIX_299_ISM_BWS /* VA: issue 299 - fix Band-width switching issues in ISM format */ #define FIX_309_PREMPH_MEM_SCE /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/ #define FIX_317 /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */ diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c index 6ea717d07e..51d738aaac 100644 --- a/lib_dec/core_switching_dec.c +++ b/lib_dec/core_switching_dec.c @@ -1029,9 +1029,7 @@ void bandwidth_switching_detect( st->bws_cnt1 = 0; } else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB -#ifdef FIX_299_ISM_BWS && st->last_low_rate_mode == 0 -#endif ) { st->bws_cnt1++; diff --git a/lib_dec/init_dec.c b/lib_dec/init_dec.c index 05183e12f5..a318d7e560 100644 --- a/lib_dec/init_dec.c +++ b/lib_dec/init_dec.c @@ -107,9 +107,7 @@ ivas_error init_decoder( st->last_good = UNVOICED_CLAS; st->clas_dec = UNVOICED_CLAS; st->low_rate_mode = 0; -#ifdef FIX_299_ISM_BWS st->last_low_rate_mode = 0; -#endif st->lp_gainp = 0.0f; st->lp_gainc = 0.0f; diff --git a/lib_dec/stat_dec.h b/lib_dec/stat_dec.h index 8bd367814f..e0547cbfc3 100644 --- a/lib_dec/stat_dec.h +++ b/lib_dec/stat_dec.h @@ -934,9 +934,7 @@ typedef struct Decoder_State int16_t ini_frame; /* initialization frames counter */ int16_t prev_coder_type; /* coding type of last frame */ int16_t low_rate_mode; /* low-rate mode flag */ -#ifdef FIX_299_ISM_BWS int16_t last_low_rate_mode; /* previous frame low-rate mode flag */ -#endif /*----------------------------------------------------------------------------------* * ACELP core parameters -- GitLab From a021682aa5a34ae3f616f4318a1f0fdfd39760c3 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:27:05 +0100 Subject: [PATCH 14/16] [cleanup] accept FIX_309_PREMPH_MEM_SCE --- lib_com/options.h | 1 - lib_enc/ivas_core_pre_proc.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 967e28c9c3..439170c1b1 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -150,7 +150,6 @@ #define FIX_197_CREND_INTERFACE #define FIX_FOR_TEST /* allows tests to pass using old TD binary file, to be removed after merge*/ -#define FIX_309_PREMPH_MEM_SCE /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/ #define FIX_317 /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */ diff --git a/lib_enc/ivas_core_pre_proc.c b/lib_enc/ivas_core_pre_proc.c index 77b31fac12..7a0d25ddfa 100644 --- a/lib_enc/ivas_core_pre_proc.c +++ b/lib_enc/ivas_core_pre_proc.c @@ -660,9 +660,7 @@ ivas_error ivas_compute_core_buffers( *-----------------------------------------------------------------*/ if ( -#ifdef FIX_309_PREMPH_MEM_SCE st->tcxonly == 0 && -#endif !( ( element_mode == IVAS_CPE_TD && st->idchan == 1 ) || element_mode == IVAS_CPE_MDCT ) ) { st->mem_preemph_enc = new_inp_16k[L_frame_tmp - 1]; -- GitLab From 67d612bfc05227258bf340d6cba0d424ff5615b5 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:27:49 +0100 Subject: [PATCH 15/16] [cleanup] accept FIX_317 --- lib_com/options.h | 1 - lib_dec/ivas_stereo_mdct_stereo_dec.c | 8 -------- 2 files changed, 9 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 439170c1b1..c8e95263aa 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -151,7 +151,6 @@ #define FIX_197_CREND_INTERFACE #define FIX_FOR_TEST /* allows tests to pass using old TD binary file, to be removed after merge*/ -#define FIX_317 /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c index 963acdc16b..82cab39d4b 100644 --- a/lib_dec/ivas_stereo_mdct_stereo_dec.c +++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c @@ -327,19 +327,11 @@ void stereo_decoder_tcx( hStereoMdct->reverse_dmx = 0; } -#ifdef FIX_317 if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_10_CORE ) ? NB_DIV : 1 ) ) ) -#else - if ( ( nrgRatio > 1.0f ) && ( k < ( ( core_r == TCX_20_CORE ) ? 1 : NB_DIV ) ) ) -#endif { v_multc( spec_r[k], nrgRatio, spec_r[k], L_frameTCX_r ); } -#ifdef FIX_317 else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_10_CORE ) ? NB_DIV : 1 ) ) ) -#else - else if ( ( nrgRatio < 1.0f ) && ( k < ( ( core_l == TCX_20_CORE ) ? 1 : NB_DIV ) ) ) -#endif { v_multc( spec_l[k], 1.0f / nrgRatio, spec_l[k], L_frameTCX_l ); } -- GitLab From 6989a161ab501e105307060fa950751ba65da23e Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 5 Feb 2023 11:47:36 +0100 Subject: [PATCH 16/16] formatting --- lib_dec/core_switching_dec.c | 4 +--- lib_dec/stat_dec.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib_dec/core_switching_dec.c b/lib_dec/core_switching_dec.c index 51d738aaac..c2a3955afb 100644 --- a/lib_dec/core_switching_dec.c +++ b/lib_dec/core_switching_dec.c @@ -1028,9 +1028,7 @@ void bandwidth_switching_detect( { st->bws_cnt1 = 0; } - else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB - && st->last_low_rate_mode == 0 - ) + else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB && st->last_low_rate_mode == 0 ) { st->bws_cnt1++; } diff --git a/lib_dec/stat_dec.h b/lib_dec/stat_dec.h index e0547cbfc3..68bbd4e9ca 100644 --- a/lib_dec/stat_dec.h +++ b/lib_dec/stat_dec.h @@ -934,7 +934,7 @@ typedef struct Decoder_State int16_t ini_frame; /* initialization frames counter */ int16_t prev_coder_type; /* coding type of last frame */ int16_t low_rate_mode; /* low-rate mode flag */ - int16_t last_low_rate_mode; /* previous frame low-rate mode flag */ + int16_t last_low_rate_mode; /* previous frame low-rate mode flag */ /*----------------------------------------------------------------------------------* * ACELP core parameters -- GitLab