Commit 55fb5b45 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 217-ber-detected-in-ism4-decoder

parents 95aee2b0 e489e321

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -157,8 +157,10 @@ 
#define FIX_IGF_NOISE_REPETITION                        /* Issue 182: fix repetition of same noise in IGF */

#define FIX_126_MDFT_FB_STATIC_MEM                      /* Issue 126: reduce static mem consumption of the MDFT FB for non-SBA formats */

#define FIX_I214_CLIPPING_STANDALONE_REND               /* Issue 214: TD standalone renderer does not handle clipping */

#define FIX_I218_PARAMISM_NOISY_SPEECH                  /* Issue 218: Fix noisy speech buffer in ParamISM */

#define FIX_I217_GSC_FLAG_IN_ISM                        /* Issue 127: fix BER detected in ISM4 due to desynchronized 'GSC_IVAS_mode' parameter */





/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_enc/ivas_ism_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -175,7 +175,11 @@ ivas_error ivas_ism_enc( 
        /* 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_I218_PARAMISM_NOISY_SPEECH

            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;

            }