Commit 63d36496 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Add additional fix to OMASA path and adjust threshold to activate validation code more correctly.

parent 81399189

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1195,7 +1195,11 @@ enum 
#define MASA_COHERENCE_TOLERANCE                0.1f

#define MASA_COHERENCE_THRESHOLD                0.1f

#define MASA_RATIO_TOLERANCE                    0.1f

#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS

#define MASA_RATIO_THRESHOLD                    0.015f

#else

#define MASA_RATIO_THRESHOLD                    0.1f

#endif

#define MASA_ANGLE_TOLERANCE                    0.5f

#define MASA_LIMIT_NO_BANDS_SUR_COH             8

#define MINIMUM_BIT_BUDGET_NORMAL_META          100

lib_enc/ivas_masa_enc.c

+3 −0
Original line number Diff line number Diff line
@@ -1260,6 +1260,9 @@ void ivas_masa_combine_directions( 
                ambience2dir = 1.0f - ratioSum;

                hMeta->directional_meta[0].energy_ratio[j][i] = sumVecLen[j][i] / ( hMeta->directional_meta[0].energy_ratio[j][i] + hMeta->directional_meta[1].energy_ratio[j][i] + ambience2dir / 2.0f );

                hMeta->directional_meta[1].energy_ratio[j][i] = 0.0f;

#ifdef NONBE_FIX_1034_DRY_MASA_RATIOS

                hMeta->common_meta.diffuse_to_total_ratio[j][i] = 1.0f - hMeta->directional_meta[0].energy_ratio[j][i];

#endif

                if ( computeCoherence )

                {

                    ambience1dir = 1.0f - hMeta->directional_meta[0].energy_ratio[j][i];