Commit 5aee5a88 authored by laitinenmik's avatar laitinenmik
Browse files

Better value for energy ratio for parametric binauralizer when in DTX

parent ed818d7a

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ 
// choose one of the following:

#define TMP_FIX                                         /* set cng_type to FD_CNG, quick hack; TODO: move init to correct place */

//#define TMP_FIX2                                        /* cng_type init here? seems to not quite produce the same results; to check */

//#define TMP_FIX3                                        /* cng_type here could work, to be verified 

//#define TMP_FIX3                                        /* cng_type here could work, to be verified */

#define PARAM_ISM_DTX_PARABIN_RATIO_FIX                 /* Nokia: Better value for energy ratio for parametric binauralizer when in DTX */

#endif



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_ism_param_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -1004,6 +1004,10 @@ void ivas_param_ism_params_to_masa_param_mapping( 
#ifdef PARAM_ISM_DTX_CNG

        if ( hDirAC->hParamIsm->paramISM_DTX_CNG_FLAG )

        {

#ifdef PARAM_ISM_DTX_PARABIN_RATIO_FIX

            float energy_ratio;

            energy_ratio = powf( st_ivas->hSCE[0]->hCoreCoder[0]->hFdCngDec->hFdCngCom->coherence, 2.0f );

#endif

            hDirAC->numSimultaneousDirections = 1;

            azimuth[0] = (int16_t) roundf( hDirAC->azimuth_values[0] );

            elevation[0] = (int16_t) roundf( hDirAC->elevation_values[0] );
@@ -1013,7 +1017,11 @@ void ivas_param_ism_params_to_masa_param_mapping( 
                {

                    hDirAC->azimuth[sf_idx][bin_idx] = azimuth[0];

                    hDirAC->elevation[sf_idx][bin_idx] = elevation[0];

#ifdef PARAM_ISM_DTX_PARABIN_RATIO_FIX

                    hDirAC->energy_ratio1[sf_idx][bin_idx] = energy_ratio;

#else

                    hDirAC->energy_ratio1[sf_idx][bin_idx] = 1.0f;

#endif

                    hDirAC->spreadCoherence[sf_idx][bin_idx] = 0.0f;

                    hDirAC->surroundingCoherence[sf_idx][bin_idx] = 0.0;

                }