Commit 4d8f69b0 authored by vaclav's avatar vaclav
Browse files

issue 1138: Fix SBA EXT output call of audioCfg2channels(); under FIX_1138_SBA_EXT_ERROR_PRINTOUT

parent 494a317a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/

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

#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 ) );