Commit 08c22851 authored by vaclav's avatar vaclav
Browse files

update within NONBE_FIX_849_OMASA_BFI_CRASH

parent 83285383

lib_dec/ivas_cpe_dec.c

+14 −11
Original line number Diff line number Diff line
@@ -1106,11 +1106,7 @@ static void stereo_mode_combined_format_dec( 
{

    int32_t element_brate_ref;



#ifdef NONBE_FIX_849_OMASA_BFI_CRASH

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT && !st_ivas->bfi )

#else

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

#endif

    {

        element_brate_ref = hCPE->element_brate;
@@ -1118,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 ) )

                {
@@ -1127,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 )

            {