Commit 74ccef6f authored by Brown, Stefanie's avatar Brown, Stefanie
Browse files

Splitting SBA_HPF_TUNING into SBA_HPF_TUNING_ENC and SBA_HPF_TUNING_DEC,... 

Splitting SBA_HPF_TUNING into SBA_HPF_TUNING_ENC and SBA_HPF_TUNING_DEC, disabling decoder side macro.
parent 79cb8c67

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ ivas_error ivas_dec( 


        /* HP filtering */

#ifndef DEBUG_SPAR_BYPASS_EVS_CODEC

#ifdef SBA_HPF_TUNING

#ifdef SBA_HPF_TUNING_DEC

        int16_t nchan_hp20;

        if ( st_ivas->ivas_format == MASA_FORMAT )

        {

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ int16_t getNumChanSynthesis( 
    {

        n = CPE_CHANNELS;

    }

#ifdef SBA_HPF_TUNING

#ifdef SBA_HPF_TUNING_DEC

    else if ( st_ivas->ivas_format == SBA_FORMAT )

    {

        if ( st_ivas->sba_analysis_order > 1 )

lib_enc/ivas_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ ivas_error ivas_enc( 
    /* bypass EVS coding in float precision, emulating EVS encoder/decoder delay */

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

    {

#ifdef SBA_HPF_TUNING

#ifdef SBA_HPF_TUNING_ENC

        if ( ( ivas_format == SBA_FORMAT ) && ( st_ivas->sba_mode == SBA_MODE_SPAR ) )

        {

            hp20( data_f[HOA_keep_ind[i]], input_frame, st_ivas->mem_hp20_in[i], input_Fs );

lib_enc/ivas_init_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ int16_t getNumChanAnalysis( 
    n = st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE;

    if ( st_ivas->hEncoderConfig->ivas_format == SBA_FORMAT )

    {

#ifdef SBA_HPF_TUNING

#ifdef SBA_HPF_TUNING_ENC

        n = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order );

#else

        n = DIRAC_MAX_ANA_CHANS;