Commit 09be4a2c authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1138_SBA_EXT_ERROR_PRINTOUT

parent 13620df9

lib_com/options.h

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


/* #################### Start BASOP porting switches ############################ */



#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define FIX_745_FIX_DATA_TYPE_CONVERSION                /* VA: issue 745: implicit data type conversion when calling IVAS_DEC_Configure() */

#define NONBE_FIX_981_PARAMBIN_DEFAULT_EARLY_PART       /* Nokia: Set default early part energy correction to unity for BINAURAL_ROOM_REVERB */

lib_rend/ivas_output_init_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -355,11 +355,7 @@ Word16 ivas_get_nchan_buffers_dec_fx( 
        {

            nchan_out_buff = s_max( nchan_out_buff, add( st_ivas->hOutSetup.nchan_out_woLFE, st_ivas->hOutSetup.num_lfe ) );

        }

#ifdef FIX_1138_SBA_EXT_ERROR_PRINTOUT

        ELSE IF( NE_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

#else

        ELSE

#endif

        {

            nchan_out_buff = s_max( audioCfg2channels( st_ivas->transport_config ), audioCfg2channels( st_ivas->intern_config ) );

            nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) );