Commit 5e197880 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch '180-unnecessary-complexity-for-sba-to-mono-or-stereo-output' into 'main' 

Resolve "unnecessary complexity for SBA to mono or stereo output" [non BE]

See merge request !218
parents 529db2bb 8c2d0dbb

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ 
#define ALLRAD_OPTIM                                    /* Issue 159: Optimize memory allocation for ALLRAD */

#define FIX_I178_HQ_BUFFER_OVERRUN                      /* issue 178: Buffer overrun in HQ core decoder -- spectral filling buffer did not account for extended transition frame in IVAS */

#define PRINT_SBA_ORDER                                 /* Issue 179: print-out also the SBA order of IVAS SBA format to stdout */



#define SPAR_STEREO_NO_DIRAC                            /* Issue 180: skip DirAC processing channels for stereo output */



#define AGC_TUNING_IMPROVEMENT                          /* Issue 168: Enable AGC for low bit rate (1 TC) */

#ifdef AGC_TUNING_IMPROVEMENT

#define AGC_ENABLE_FOR_LBR                              /* Issue 168: Enable AGC for low bit rate (1 TC) */

lib_dec/ivas_init_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -790,7 +790,12 @@ ivas_error ivas_init_decoder( 
                    return error;

                }



                if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA )

                if ( hDecoderConfig->output_config != AUDIO_CONFIG_FOA

#ifdef SPAR_STEREO_NO_DIRAC

                     && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO 

                     && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO

#endif

                    )

                {

                    if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK )

                    {

lib_dec/ivas_output_init.c

+6 −0
Original line number Diff line number Diff line
@@ -515,6 +515,12 @@ void ivas_renderer_select( 
            {

                *internal_config = output_config;

            }

#ifdef SPAR_STEREO_NO_DIRAC

            else if ( output_config == AUDIO_CONFIG_MONO || output_config == AUDIO_CONFIG_STEREO )

            {

                *internal_config = AUDIO_CONFIG_FOA;

            }

#endif

            else

            {

                *internal_config = AUDIO_CONFIG_HOA3;

lib_dec/ivas_spar_decoder.c

+6 −1
Original line number Diff line number Diff line
@@ -1146,7 +1146,12 @@ void ivas_spar_dec_upmixer( 
            }

        }



        if ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_FOA )

        if ( st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_FOA 

#ifdef SPAR_STEREO_NO_DIRAC

            && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_STEREO 

            && st_ivas->hDecoderConfig->output_config != AUDIO_CONFIG_MONO

#endif

            )

        {

            ivas_dirac_dec( st_ivas, output, nchan_internal, cldfb_in_ts_re, cldfb_in_ts_im, i_sf );

        }