Commit eab6f17a authored by malenov's avatar malenov
Browse files

amend fix to prevent switching from MDCT stereo to TD stereo at 16.4 kbps in MASA 2TC

parent 2c0175ad

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define BE_FIX_832_ASAN_ERROR_EFAP_OSBA                       /* FhG: issue #832: fix ASAN error caused by re-allocating EFAP memories in OSBA*/

#define NONBE_FIX_819_DOUBLE_PREC_COMB_FORMATS                /* VA: issue 820: Double precision arithmetic in combined formats */

#define NONBE_FIX_849_OMASA_BFI_CRASH                         /* VA: issue 849: fix OMASA 2TC and FEC crashes */

#define NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING             /* VA: issue 861: fix MASA 2TC crash when switching from MDCT stereo to TD/DFT stereo */





/* ##################### End NON-BE switches ########################### */

lib_enc/ivas_stereo_classifier.c

+5 −1
Original line number Diff line number Diff line
@@ -131,7 +131,11 @@ int16_t select_stereo_mode( 
        hStereoClassif->lrtd_mode = 0;

        element_mode = IVAS_CPE_DFT;



        if ( hCPE->element_brate > IVAS_13k2 && hCPE->hCoreCoder[0]->hSpMusClas->past_dlp[0] < 1.0f && hCPE->hCoreCoder[0]->hSpMusClas->wdlp_xtalk < -0.01f && hCPE->hCoreCoder[0]->vad_flag == 1 && ( hCPE->hStereoMdct->sw_uncorr || hStereoClassif->xtalk_decision ) )

        if (

#ifdef NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING

            stereo_switching_flag == 1 &&

#endif

            hCPE->element_brate > IVAS_13k2 && hCPE->hCoreCoder[0]->hSpMusClas->past_dlp[0] < 1.0f && hCPE->hCoreCoder[0]->hSpMusClas->wdlp_xtalk < -0.01f && hCPE->hCoreCoder[0]->vad_flag == 1 && ( hCPE->hStereoMdct->sw_uncorr || hStereoClassif->xtalk_decision ) )

        {

            hStereoClassif->lrtd_mode = 1;

            element_mode = IVAS_CPE_TD;