Commit 5ab23872 authored by vaclav's avatar vaclav
Browse files

Merge branch '1138-error-printouts-in-sba-ext-output' into 'main' 

Resolve "Error printouts in SBA EXT output"

See merge request !1672
parents 9609984f f815d188

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
//#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT          /* Orange issue 1031 : new fix point hrtf binary file format */

//#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */

#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */

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



/* #################### End BE switches ################################## */

lib_rend/ivas_output_init.c

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