Commit c1127fd0 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_422

parent 0bb0dfd5

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 
/*#define FIX_XXX_JBM_FIFO_BUFFER  */                   /* FhG: prevent wraparound of a length identifier in cause of large frames and many channels*/





#define FIX_422                                         /* FhG: Issue 422: re-introduce fix for noisy speech buffer in ParamISM */



#define ERI_MSVQ_CLEANUP                                /* Eri: Contribution #31  BE modularization of msvq encoder side DCT21&DCT24 within msvq_enc()        */

#define FIX_416_ISM_BR_SWITCHING                        /* FhG: add missing CLDFB reconfig to ISM BR switching */

lib_enc/ivas_ism_param_enc.c

+0 −8
Original line number Diff line number Diff line
@@ -477,11 +477,7 @@ 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;

        }
@@ -514,11 +510,7 @@ 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;

            }