Commit c627de43 authored by Jan Kiene's avatar Jan Kiene
Browse files

port MR 2297 from float 

 Fix crash with IGF and bandwidth switching when DTX is enabled
parent e18c9336

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

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

#define CODE_IMPROVEMENTS



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



// object-editing feature porting

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

lib_enc/ivas_cpe_enc_fx.c

+47 −38
Original line number Diff line number Diff line
@@ -988,6 +988,12 @@ ivas_error ivas_cpe_enc_fx( 
     * Core codec configuration

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



#ifdef FIX_1411_IGF_CRASH_BW_SWITCHING

    test();

    test();

    IF( NE_16( ( EQ_16( sts[0]->core_brate, SID_2k40 ) || EQ_16( sts[0]->core_brate, FRAME_NO_DATA ) ), 0 ) ) /* Reconfigurations not needed with DTX*/

    {

#endif

        test();

        IF( EQ_16( hCPE->element_mode, IVAS_CPE_MDCT ) && st_ivas->hMCT == NULL )

        {
@@ -1050,6 +1056,9 @@ ivas_error ivas_cpe_enc_fx( 
                }

            }

        }

#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++ )