Commit 5fe5d9a9 authored by Brown, Stefanie's avatar Brown, Stefanie
Browse files

Relabelling BR switching fixes for HP20 files as SBA_HPF_TUNING_ENC and SBA_HPF_TUNING_DEC

parent 0e73a2ae

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ ivas_error ivas_sba_dec_reconfigure( 
     *-----------------------------------------------------------------*/



    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

#ifndef FIX_331_SBA_HBR_HOA_FIXES

#ifndef SBA_HPF_TUNING_DEC

    nchan_hp20_old = getNumChanSynthesis( st_ivas );

#else

    int16_t analysis_order_old;

lib_enc/ivas_sba_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ ivas_error ivas_sba_enc_reconfigure( 
        SPAR_ENC_HANDLE hSpar;

        SBA_MODE sba_mode_old;

#endif

#ifdef FIX_331_SBA_HBR_HOA_FIXES

#ifdef SBA_HPF_TUNING_ENC

        int16_t analysis_order_old;

#endif

        nchan_transport_old = st_ivas->nchan_transport;
@@ -355,7 +355,7 @@ ivas_error ivas_sba_enc_reconfigure( 
        st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, hEncoderConfig->sba_order );

#ifdef SBA_BR_SWITCHING

        st_ivas->sba_mode = ivas_sba_mode_select( ivas_total_brate );

#ifdef FIX_331_SBA_HBR_HOA_FIXES

#ifdef SBA_HPF_TUNING_ENC

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

        if ( analysis_order_old != st_ivas->sba_analysis_order )

        {