Commit 07b32360 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING

parent 3e9e7610

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ 


#define NONBE_FIX_787_PARAM_UPMIX_LEVEL                       /* Dlb: issue 787: fix level of Mono/Stereo for ParamUpmix mode */



#define NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING             /* VA: Issue 735: Resolve "HP20 filtering bug in SBA/OSBA bitrate switching" */

#define NONBE_FIX_588_UPDATE_FASTCONV_SD                      /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */

#define NONBE_FIX_774_OSBA_MONO_DEC_CRASH                     /* FhG: issue 774: decoder crash for OSBA to mono */

#define NONBE_FIX_802_PARAMUPMIX_HIGHPASS                     /* Dlb: issue 802: Move HighPass filter operation for ParamUpmix */

lib_enc/ivas_enc.c

+0 −11
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ ivas_error ivas_enc( 
    dbgwrite( data_f[LFE_CHANNEL], sizeof( float ), n_samples_chan, 1, "./res/lfe_input" );

#endif



#ifdef NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING

    if ( ivas_format == SBA_FORMAT )

    {

        if ( ( error = ivas_sba_enc_reconfigure( st_ivas ) ) != IVAS_ERR_OK )
@@ -141,7 +140,6 @@ ivas_error ivas_enc( 
            return error;

        }

    }

#endif



    /*----------------------------------------------------------------*

     * HP filtering
@@ -217,12 +215,6 @@ ivas_error ivas_enc( 
        /* SBA/MASA configuration */

        if ( ivas_format == SBA_FORMAT )

        {

#ifndef NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING

            if ( ( error = ivas_sba_enc_reconfigure( st_ivas ) ) != IVAS_ERR_OK )

            {

                return error;

            }

#endif

        }

        else

        {
@@ -378,9 +370,6 @@ ivas_error ivas_enc( 
    {

        int16_t planar_sba_orig;

        planar_sba_orig = hEncoderConfig->sba_planar;

#ifndef NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING

        ivas_osba_enc_reconfig( st_ivas );

#endif



        /* Analyze objects and determine needed audio signals */

        ivas_osba_enc( st_ivas->hOSba, st_ivas->hIsmMetaData, data_f, input_frame, hEncoderConfig->nchan_ism, st_ivas->ism_mode, st_ivas->sba_analysis_order, hEncoderConfig->input_Fs, hEncoderConfig->sba_planar );