From bddfcdb1510bcea311f3493b3421ade332d6a9d5 Mon Sep 17 00:00:00 2001 From: vaclav Date: Mon, 6 Mar 2023 09:48:55 +0100 Subject: [PATCH] issue 360: consider objects being speech+noise for active speech coding; under TUNE_360_OBJECT_WITH_NOISE --- lib_com/options.h | 2 +- lib_enc/ivas_ism_metadata_enc.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 45406dadb9..ab3d15040e 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -162,8 +162,8 @@ #define BINAURALIZATION_DELAY_REPORT /* VA: Issue 255 - Changes the way the decoder delay is reported */ #define FIX_351_HRTF_COMMAND /* VA: Issue 354 - improve "-hrtf" command-line option */ - #define FIX_94_VERIFY_WAV_NUM_CHANNELS /* FhG: Issue 94 - Check if number of channels in input wav file matches encoder/renderer configuration */ +#define TUNE_360_OBJECT_WITH_NOISE /* VA: issue 360: consider objects being speech+noise for active speech coding */ /* ################## End DEVELOPMENT switches ######################### */ diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc.c index 9aaa3af4b4..2171729472 100644 --- a/lib_enc/ivas_ism_metadata_enc.c +++ b/lib_enc/ivas_ism_metadata_enc.c @@ -210,6 +210,9 @@ ivas_error ivas_ism_metadata_enc( } else if ( ism_mode == ISM_MODE_DISC ) { +#ifdef TUNE_360_OBJECT_WITH_NOISE + hIsmMeta[ch]->ism_metadata_flag = localVAD[ch] || hSCE[ch]->hCoreCoder[0]->lp_noise > 10; +#else hIsmMeta[ch]->ism_metadata_flag = localVAD[ch]; if ( hIsmMeta[ch]->ism_metadata_flag == 0 ) @@ -223,6 +226,7 @@ ivas_error ivas_ism_metadata_enc( hIsmMeta[ch]->ism_metadata_flag = 1; } } +#endif if ( hSCE[ch]->hCoreCoder[0]->tcxonly ) { @@ -238,6 +242,7 @@ ivas_error ivas_ism_metadata_enc( rate_ism_importance( nchan_transport, hIsmMeta, hSCE, ism_imp ); +#ifndef TUNE_360_OBJECT_WITH_NOISE /* relax the importance decision in "stereo" coding for noisy audio */ if ( ism_mode == ISM_MODE_DISC && num_obj == 2 ) { @@ -257,7 +262,7 @@ ivas_error ivas_ism_metadata_enc( } } } - +#endif /*----------------------------------------------------------------* * Write ISm common signaling *----------------------------------------------------------------*/ -- GitLab