Commit 6e46dec1 authored by vaclav's avatar vaclav
Browse files

accept NONBE_FIX_838_CRASH_24_4_WB

parent bda232cf

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_838_CRASH_24_4_WB                           /* FhG: Issue 838: fix encoder crashes for Unified Stereo and MASA 2 TC at 24.4 kbps WB due to missing IGF (re-) allocation */

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

lib_enc/ivas_cpe_enc.c

+0 −9
Original line number Diff line number Diff line
@@ -110,12 +110,9 @@ ivas_error ivas_cpe_enc( 
    ivas_error error;

    int32_t cpe_brate;

    int32_t element_brate_ref;

#ifdef NONBE_FIX_838_CRASH_24_4_WB

    int16_t last_bits_frame_nominal; /* last_bits_frame_nominal for M or PCh channel */

#endif



    error = IVAS_ERR_OK;



    push_wmops( "ivas_cpe_enc" );



    hCPE = st_ivas->hCPE[cpe_id];
@@ -126,9 +123,7 @@ ivas_error ivas_cpe_enc( 
    input_Fs = hEncoderConfig->input_Fs;

    ivas_total_brate = hEncoderConfig->ivas_total_brate;

    element_brate_ref = hCPE->element_brate;

#ifdef NONBE_FIX_838_CRASH_24_4_WB

    last_bits_frame_nominal = sts[0]->bits_frame_nominal;

#endif



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

     * Initialization - general
@@ -527,11 +522,7 @@ ivas_error ivas_cpe_enc( 
    /* IGF reconfiguration */

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

    {

#ifdef NONBE_FIX_838_CRASH_24_4_WB

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

#else

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

#endif

        {

            int16_t igf;

            igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, sts[n]->max_bwidth, sts[n]->rf_mode );