Commit 1f3ba921 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into orange/no-diegetic-pan-with-radius

parents 8b3cc51d a24d3b7e

lib_com/ivas_mc_param_com.c

+4 −0
Original line number Diff line number Diff line
@@ -406,7 +406,11 @@ static int16_t ivas_param_mc_get_num_param_bands( 
            switch ( ivas_total_brate )

            {

                case IVAS_128k:

#ifdef FIX_122_MC_DECODER_COMPLEXITY

                    num_parameter_bands = 14;

#else

                    num_parameter_bands = 20;

#endif

                    break;

                case IVAS_160k:

                    num_parameter_bands = 20;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ 
#define FIX_570_TCX_LPC_WRITE                           /* FhG: fix issue 570: LPC bitstream writer in TCX */

#define FIX_506                                         /* FhG: Compiler warnings */

#define FIX_511_OPTIMIZE_PARAMBIN_GAIN_FETCH            /* Nokia: Issue 511, significant optimization of parametric binauralizer gain fetching. */

#define FIX_122_MC_DECODER_COMPLEXITY                   /* FhG: Issue 122, significant decrease of worst case MC decoder complexity */

#define FIX_531_BWS_ISM_BFI                             /* VA: issue 531: fix MemorySanitizer: use-of-uninitialized-value in ISM2 rate switching with frame errors */

#define FIX_395_CNG_BW                                  /* Eri: Issue 395 - CNG bandwidth issue for unified stereo */

lib_enc/ivas_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ ivas_error ivas_enc( 
    else if ( ivas_format == ISM_FORMAT )

    {

        /* select ISM format mode; reconfigure the ISM format encoder */

        if ( ( ivas_ism_enc_config( st_ivas ) ) )

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

        {

            return error;

        }