Commit 25a76cd3 authored by vaclav's avatar vaclav
Browse files

issue 559: fix mismatch between st->extl and st->igf observed as crash in... 

issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching; under FIX_559_EXTL_IGF_MISMATCH
parent f8c88e09

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ 


#define IGF_TUNING_96                                   /* FhG: Issue 546: slight tuning of IGF config used in 96 kbps stereo, 128 kbps SBA and others */



#define FIX_559_EXTL_IGF_MISMATCH                       /* VA: issue 559: fix mismatch between st->extl and st->igf observed as crash in PlanarSBA bitrate switching */





/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_enc/ivas_core_pre_proc.c

+7 −4
Original line number Diff line number Diff line
@@ -129,11 +129,7 @@ ivas_error pre_proc_ivas( 
    {

        st->L_frame = L_FRAME32k;

    }

#ifdef FIX_557_CRASH_IN_ISM_DTX

    else if ( st->bwidth >= SWB && st->total_brate > MAX_ACELP_BRATE_ISM && st->total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE && st->is_ism_format && st->tcxonly && st->core_brate != SID_2k40 )

#else

    else if ( st->bwidth >= SWB && st->total_brate > MAX_ACELP_BRATE_ISM && st->total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE && st->is_ism_format && st->tcxonly )

#endif

    {

        st->L_frame = L_FRAME25_6k;

    }
@@ -289,6 +285,13 @@ ivas_error pre_proc_ivas( 
    else if ( element_brate != last_element_brate )

    {

        SetModeIndex( st, st->bits_frame_nominal * FRAMES_PER_SEC, element_mode, MCT_flag );



#ifdef FIX_559_EXTL_IGF_MISMATCH

        if ( st->extl != -1 && st->extl != IGF_BWE && st->igf == 1 )

        {

            st->igf = 0;

        }

#endif

    }