Commit 37abd38b authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix issue 447 by tuning regularization factor for MASA & McMASA

parent 3f97bd3d
Loading
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@

#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. */

 /* ################## End DEVELOPMENT switches ######################### */
/* clang-format on */
#endif
+11 −0
Original line number Diff line number Diff line
@@ -2936,6 +2936,12 @@ static

    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;
@@ -2948,6 +2954,7 @@ static
        {
            reqularizationFactor = 0.4f;
        }
#endif
        else if ( ivas_total_brate == IVAS_128k )
        {
            reqularizationFactor = 0.5f;
@@ -2970,7 +2977,11 @@ static
    {
        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 )
        {