Commit 412a30aa authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch '1411-encoder-crash-in-igfupdateinfo-with-masa-dtx-bw-switching' into 'main' 

[Non-BE] Fix crash with IGF and bandwidth switching when DTX is enabled

See merge request !2297
parents cc874915 503b0540

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */





/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */
@@ -180,6 +181,7 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES             /* Nokia: Fix for issues 1399: obj edit broken with MC/SBA output in VOIP, and 1400: negative energy estimate used for gaining. */

#define FIX_1411_IGF_CRASH_BW_SWITCHING                 /* FhG: Fix for issue 1411: fixes crash that can happen for IGF with BW switching and DTX*/



#define NONBE_1412_AVOID_ROUNDING_AZ_ELEV              /* FhG:  Avoid rounding when passing azimuth and elevation to efap_determine_gains() */

lib_enc/ivas_cpe_enc.c

+35 −23
Original line number Diff line number Diff line
@@ -528,6 +528,10 @@ ivas_error ivas_cpe_enc( 
     * Core codec configuration

     *----------------------------------------------------------------*/



#ifdef FIX_1411_IGF_CRASH_BW_SWITCHING

    if ( !( sts[0]->core_brate == SID_2k40 || sts[0]->core_brate == FRAME_NO_DATA ) ) /* Reconfigurations not needed with DTX*/

    {

#endif

        if ( hCPE->element_mode == IVAS_CPE_MDCT && st_ivas->hMCT == NULL )

        {

            /* set coded BW for MDCT stereo */
@@ -552,7 +556,12 @@ ivas_error ivas_cpe_enc( 
        /* IGF reconfiguration */

        for ( n = 0; n < n_CoreChannels; n++ )

        {

        if ( ( hCPE->last_element_brate != hCPE->element_brate || hCPE->element_mode != hCPE->last_element_mode || ( hCPE->element_mode == IVAS_CPE_TD && sts[0]->bits_frame_nominal != last_bits_frame_nominal ) || sts[n]->last_bwidth != sts[n]->bwidth ) && ( n == 0 || hCPE->element_mode == IVAS_CPE_MDCT ) )

            if ( ( hCPE->last_element_brate != hCPE->element_brate || hCPE->element_mode != hCPE->last_element_mode || ( hCPE->element_mode == IVAS_CPE_TD && sts[0]->bits_frame_nominal != last_bits_frame_nominal ) || sts[n]->last_bwidth != sts[n]->bwidth

#ifdef FIX_1411_IGF_CRASH_BW_SWITCHING

                   || ( sts[n]->last_core_brate == SID_2k40 || sts[n]->last_core_brate == FRAME_NO_DATA )

#endif

                       ) &&

                 ( n == 0 || hCPE->element_mode == IVAS_CPE_MDCT ) )

            {

                int16_t igf;

                int16_t bw;
@@ -569,6 +578,9 @@ ivas_error ivas_cpe_enc( 
                }

            }

        }

#ifdef FIX_1411_IGF_CRASH_BW_SWITCHING

    }

#endif



    /* set ACELP@12k8 / ACELP@16k flag for flexible ACELP core */

    for ( n = 0; n < n_CoreChannels; n++ )