Commit a2dd1afe authored by vaclav's avatar vaclav
Browse files

Merge branch '849-omasa-2tc-and-fec-crashes' into 'main' 

Resolve "OMASA 2TC and FEC crashes"

See merge request !1147
parents 1c4b1c70 d123b785

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ 
#define NONBE_FIX_839_MC_RS_CHANNEL_ALLOC                     /* FhG: Issues #839: problems with reallocation of the channels on the heap in case of MC RS */

#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 */





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

lib_dec/ivas_cpe_dec.c

+14 −7
Original line number Diff line number Diff line
@@ -1114,6 +1114,10 @@ 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 ) )

                {
@@ -1123,6 +1127,9 @@ 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 )

            {