Commit a08ffb86 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '1888_basop_mr1672' into 'main' 

basop porting mr 1672 -- basop branch

See merge request !2034
parents ffd5f0b3 04ebeb8f

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
#define NONBE_1325_TD_STEREO_QUANT_LSF_SEC              /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */

#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */



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



/* #################### End BASOP porting switches ############################ */

lib_rend/ivas_output_init_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -355,7 +355,11 @@ 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 ) );