From 64cf5add2b9eb06ed4d1727c42cf95214bf67a4f Mon Sep 17 00:00:00 2001 From: Andrea Eichenseer Date: Mon, 24 Apr 2023 18:20:30 +0200 Subject: [PATCH] Fix issue 422. --- lib_com/options.h | 1 + lib_enc/ivas_ism_param_enc.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 5ce08d7ec1..3cad3e09ff 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -150,6 +150,7 @@ #define PARAMMC_SHORT_ENC_MDFT /* FhG: Issue 410: complexity optimization for parametric Multichannel modes */ +#define FIX_422 /* FhG: Issue 422: re-introduce fix for noisy speech buffer in ParamISM */ /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ #endif diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc.c index abe5842f70..32fb6af515 100644 --- a/lib_enc/ivas_ism_param_enc.c +++ b/lib_enc/ivas_ism_param_enc.c @@ -429,7 +429,11 @@ void ivas_param_ism_compute_noisy_speech_flag( /* For the current frame, make a decision based on some core-coder flags */ if ( st_ivas->hSCE[0]->hCoreCoder[0]->flag_noisy_speech_snr && st_ivas->hSCE[1]->hCoreCoder[0]->flag_noisy_speech_snr ) { +#ifdef FIX_422 + if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag || st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) +#else if ( st_ivas->hSCE[0]->hCoreCoder[0]->vad_flag && st_ivas->hSCE[1]->hCoreCoder[0]->vad_flag ) +#endif { st_ivas->hDirAC->hParamIsm->noisy_speech_buffer[i] = 0; } -- GitLab