Commit 476024dc authored by multrus's avatar multrus
Browse files

[cleanup] remove code within SBA_HPF_TUNING_DEC

parent 34e0520b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ 
#endif

#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SBA_HPF_TUNING_DEC*/



#define FIX_350_MASA_DELAY_COMP                         /* Nokia: Issue 350: MASA audio/meta delay compensation */

#define FIX_MDCT_BASED_BWD                              /* FhG: fixes for BWD for issues with reaction to transients for MDCT-stereo and MCT */

lib_dec/ivas_dec.c

+0 −13
Original line number Diff line number Diff line
@@ -408,20 +408,7 @@ ivas_error ivas_dec( 


        /* HP filtering */

#ifndef DEBUG_SPAR_BYPASS_EVS_CODEC

#ifdef SBA_HPF_TUNING_DEC

        int16_t nchan_hp20;

        if ( st_ivas->ivas_format == MASA_FORMAT )

        {

            nchan_hp20 = nchan_remapped;

        }

        else

        {

            nchan_hp20 = getNumChanSynthesis( st_ivas );

        }

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

#else

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

#endif

        {

            hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

        }

lib_dec/ivas_init_dec.c

+0 −18
Original line number Diff line number Diff line
@@ -532,28 +532,10 @@ int16_t getNumChanSynthesis( 
    {

        n = CPE_CHANNELS;

    }

#ifdef SBA_HPF_TUNING_DEC

    else if ( st_ivas->ivas_format == SBA_FORMAT )

    {

        if ( st_ivas->sba_analysis_order > 1 )

        {

            n = 0;

        }

        else

        {

            n = st_ivas->nchan_transport;

        }

    }

    else if ( st_ivas->hMCT != NULL )

    {

        n = st_ivas->nchan_transport;

    }

#else

    else if ( st_ivas->hMCT != NULL || st_ivas->ivas_format == SBA_FORMAT )

    {

        n = st_ivas->nchan_transport;

    }

#endif



    return n;

}

lib_dec/ivas_sba_dec.c

+0 −13
Original line number Diff line number Diff line
@@ -132,20 +132,7 @@ ivas_error ivas_sba_dec_reconfigure( 
     *-----------------------------------------------------------------*/



    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

#ifndef SBA_HPF_TUNING_DEC

    nchan_hp20_old = getNumChanSynthesis( st_ivas );

#else

    int16_t analysis_order_old;

    analysis_order_old = ivas_sba_get_analysis_order( last_ivas_total_brate, st_ivas->sba_order );

    if ( analysis_order_old > 1 )

    {

        nchan_hp20_old = 0;

    }

    else

    {

        nchan_hp20_old = st_ivas->nchan_transport;

    }

#endif

    nSCE_old = st_ivas->nSCE;

    nCPE_old = st_ivas->nCPE;

    nchan_transport_old = st_ivas->nchan_transport;