Commit 3bbe8f40 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '1888_ref_mr1672' into 'ivas-float-update' 

basop porting MR 1672 -- float branch

See merge request !2033
parents a5408903 363f7149

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ 
#define NONBE_FIX_1130_DIV_ZERO_LEV_DUR                 /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */

#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.c

+4 −0
Original line number Diff line number Diff line
@@ -311,7 +311,11 @@ int16_t ivas_get_nchan_buffers_dec( 
        {

            nchan_out_buff = max( nchan_out_buff, st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe );

        }

#ifdef FIX_1138_SBA_EXT_ERROR_PRINTOUT

        else if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

#else

        else

#endif

        {

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

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