Commit 9e5cadb0 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_447_PARAMBIN_MASA_REGU_FAC

parent 183cce03

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ 
#define FIX_439_OTR_PARAMS                              /* Philips: Issue 439: orientation tracking parameter aspects. */





#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 MC_PARAMUPMIX_MODE                              /* Dlb: Contribution 39: Multichannel Parametric Upmix */

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −19
Original line number Diff line number Diff line
@@ -2192,25 +2192,10 @@ static void hrtfShGetHrtf( 


    if ( ivas_format == MASA_FORMAT )

    {

#ifdef FIX_447_PARAMBIN_MASA_REGU_FAC

        if ( ivas_total_brate >= IVAS_160k )

        {

            reqularizationFactor = 0.4f;

        }

#else

        if ( ivas_total_brate >= IVAS_256k )

        {

            reqularizationFactor = 0.2f;

        }

        else if ( ivas_total_brate == IVAS_192k )

        {

            reqularizationFactor = 0.3f;

        }

        else if ( ivas_total_brate == IVAS_160k )

        {

            reqularizationFactor = 0.4f;

        }

#endif

        else if ( ivas_total_brate == IVAS_128k )

        {

            reqularizationFactor = 0.5f;
@@ -2233,11 +2218,7 @@ static void hrtfShGetHrtf( 
    {

        if ( ivas_total_brate >= IVAS_96k )

        {

#ifdef FIX_447_PARAMBIN_MASA_REGU_FAC

            reqularizationFactor = 0.4f;

#else

            reqularizationFactor = 0.3f;

#endif

        }

        else if ( ivas_total_brate >= IVAS_80k )

        {