Commit 8547aaae authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_849_OMASA_BFI_CRASH

parent c4361f07

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



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

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/



#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

lib_dec/ivas_cpe_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1114,10 +1114,8 @@ static void stereo_mode_combined_format_dec( 
             ( ( st_ivas->nchan_ism == 3 && st_ivas->hDecoderConfig->ivas_total_brate == IVAS_96k ) ||

               ( st_ivas->nchan_ism == 4 && st_ivas->hDecoderConfig->ivas_total_brate == IVAS_128k ) ) )

        {

#ifdef NONBE_FIX_849_OMASA_BFI_CRASH

            if ( !st_ivas->bfi )

            {

#endif

                /* read OMASA stereo mode signalling */

                if ( get_next_indice( hCPE->hCoreCoder[0], NBITS_ELEMENT_MODE ) )

                {
@@ -1127,9 +1125,7 @@ static void stereo_mode_combined_format_dec( 
                {

                    hCPE->element_mode = IVAS_CPE_DFT;

                }

#ifdef NONBE_FIX_849_OMASA_BFI_CRASH

            }

#endif



            if ( hCPE->element_mode == IVAS_CPE_MDCT )

            {