Commit 317cb652 authored by Jonas Svedberg's avatar Jonas Svedberg
Browse files

Merge branch 'main' into ericsson/sns-msvq-48kbps-basop-opt-quant

parents 3bb86916 f0f11f8d

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ 
#define FIX_440_PARAM_ISM_DIR_NOISE                     /* FhG: Issue 440: Fix directional background noise becoming diffuse in ParamISM */



#define FIX_447_PARAMBIN_MASA_REGU_FAC                  /* Nokia: Issue 447: Fix issue by adjusting regularization factor minimum value. */

#define FIX_441_SBA_PARAMBIN_GAINS                      /* Nokia: Fix issue 441 by changing gains in SBA path of parametric binauralizer */



#define ERI_SNSVQ_ROMOPT                                 /* Eri: BASOP ROM OPT store added SNS VQ stage 1 tables  in DCT16 domain,  as for FDCNGVQ stage 1  */

//#define SNS_MSVQ_DEBUG                                 /* measure SD */

lib_dec/ivas_dec.c

+13 −0
Original line number Diff line number Diff line
@@ -373,7 +373,20 @@ ivas_error ivas_dec( 
        }

        else if ( st_ivas->ivas_format == SBA_FORMAT && ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

        {

#ifdef FIX_441_SBA_PARAMBIN_GAINS

            float gain;



            if ( nchan_remapped == 1 )

            {

                gain = 1.4454f;

            }

            else

            {

                gain = 1.3657f;

            }

#else

            float gain = 0.8414f; /* Todo: Temporary gain for roughly matching the loudness. To be tuned later together with other outputs. */

#endif



            for ( n = 0; n < nchan_remapped; n++ )

            {