Commit 93b190fc authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1283_STEREO_DFT_COLLAPSE

parent f5dbeace

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ 
#define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT  /* Dolby: Issue 2250:  random vector generation in GenShapedSHBExcitation() */

#define FIX_2338_HARM_GSC_GAIN_COMP                     /* VA: basop issue 2338: harmonization of band gain computation for both EVS and IVAS */

#define FIX_BASOP_2361_OTR                              /* FhG: Basop issue 2361: Orientation tracking tests for equivalent rotations fail */

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

#define FIX_2379_REMOVE_previoussynth_fx_32             /* VA: basop issue 2379: remove duplicated buffer st->previoussynth_fx_32[] */

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

lib_enc/cod_tcx_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -623,11 +623,7 @@ void ShapeSpectrum_ivas_fx( 
    test();

    test();

    test();

#ifndef FIX_1283_STEREO_DFT_COLLAPSE

    IF( LE_32( total_brate, ACELP_13k20 ) && EQ_16( st->bwidth, SWB ) )

#else

    IF( ( LE_32( total_brate, ACELP_13k20 ) || ( LE_32( st->element_brate, IVAS_16k4 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( st->bwidth, SWB ) )

#endif

    {

        max_low_pre = 0;

        move32();
@@ -705,11 +701,7 @@ void ShapeSpectrum_ivas_fx( 
    test();

    test();

    test();

#ifndef FIX_1283_STEREO_DFT_COLLAPSE

    IF( LE_32( total_brate, ACELP_13k20 ) && EQ_16( st->bwidth, SWB ) )

#else

    IF( ( LE_32( total_brate, ACELP_13k20 ) || ( LE_32( st->element_brate, IVAS_16k4 ) && EQ_16( st->element_mode, IVAS_CPE_DFT ) ) ) && EQ_16( st->bwidth, SWB ) )

#endif

    {

        Word16 sf_width;

        Word16 dist_low, dist_high;

lib_enc/ivas_sce_enc_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -473,10 +473,8 @@ ivas_error create_sce_enc_fx( 
    }



    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;

    move32();

#endif

    st->mct_chan_mode = MCT_CHAN_MODE_REGULAR;

    move32();

    move32();