Commit 9a2a9091 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1283_STEREO_DFT_COLLAPSE

parent 4c779b86

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_1465_SWB_TBE_RANDOM_VECTOR_CREATION         /* Dolby: issue 1465: Fix constant in create_random_vector() to allow more reliable fixed point port */

#define FIX_1283_STEREO_DFT_COLLAPSE                    /* FhG: issue 1283: fix for critical issue with DFT stereo core coder */

#define FIX_BASOP_2396_CONSTANT_STRIDE_IN_TC_BUFFER     /* FhG/VA: basop issue 2396: keep TC channel pointers in one constant place during decoding and rendering */

/* ##################### End NON-BE switches ########################### */

lib_enc/cod_tcx.c

+0 −8
Original line number Diff line number Diff line
@@ -728,11 +728,7 @@ void ShapeSpectrum( 
        hTcxCfg->SFM2 = SFM_Cal( spectrum, min( 200, L_frame ) );

    }



#ifndef FIX_1283_STEREO_DFT_COLLAPSE

    if ( ( total_brate <= ACELP_13k20 && st->bwidth == SWB ) )

#else

    if ( ( total_brate <= ACELP_13k20 || ( st->element_brate <= IVAS_16k4 && st->element_mode == IVAS_CPE_DFT ) ) && st->bwidth == SWB )

#endif

    {

        max_low_pre = 0.f;

        for ( i = 0; i < L_frame; i++ )
@@ -777,11 +773,7 @@ void ShapeSpectrum( 
    }



/* reduce the peaks in the IGF region, to make life of the core-coder easier... */

#ifndef FIX_1283_STEREO_DFT_COLLAPSE

    if ( total_brate <= ACELP_13k20 && st->bwidth == SWB )

#else

    if ( ( total_brate <= ACELP_13k20 || ( st->element_brate <= IVAS_16k4 && st->element_mode == IVAS_CPE_DFT ) ) && st->bwidth == SWB )

#endif

    {

        int16_t dist_low, dist_high;

        float max_fac;

lib_enc/ivas_sce_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -361,9 +361,7 @@ ivas_error create_sce_enc( 
    }



    st->total_brate = hSCE->element_brate; /* dummy initialization for getting right pointers initialization of input buffers in init_coder_ace_plus() */

#ifdef FIX_1283_STEREO_DFT_COLLAPSE

    st->element_brate = -1;

#endif

    st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;



    if ( ( error = init_encoder( st, st_ivas, 0, 0, st_ivas->ism_mode, hSCE->element_brate ) ) != IVAS_ERR_OK )