Commit f46604c1 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '1096-usan-nan-value-in-mc-5-1-decoding-to-stereo-at-13-2kbps-wb' into 'main' 

[NON-BE] Resolve "USAN: NaN value in MC 5.1 decoding to STEREO at 13.2kbps WB"

See merge request !1585
parents c3c5d667 384783ac

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ 
#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

#define NONBE_FIX_1091_PMC_LOW_SIGNAL_BURSTS            /* FhG: fix for #1091, fix limit calculation for the regularized inverse of Kx to avoid bursts in very low signals */

#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

#define NONBE_FIX_1096_NAN_VALUES_IN_DIRAC_TO_STEREO    /* FhG: avoid sidegain DFT-Stereo param to be larger than 1 when converting from Dirac parameters */

/* ##################### End NON-BE switches ########################### */



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

lib_dec/ivas_sba_dirac_stereo_dec.c

+13 −0
Original line number Diff line number Diff line
@@ -395,10 +395,23 @@ static void map_params_dirac_to_stereo( 
                }

            }



#ifdef NONBE_FIX_1096_NAN_VALUES_IN_DIRAC_TO_STEREO

            /* Clamp values here. [-1, 1] is the allowed range, but due to precision issues they can be slightly off which can cause problems later. */

            side_gain[b] *= sqrtf( 1.f - diffuseness[b] );

            side_gain[b] = max( min( side_gain[b], 1 ), -1 );

            side_gain[b + STEREO_DFT_BAND_MAX] *= sqrtf( 1.f - diffuseness[b] );

            side_gain[b + STEREO_DFT_BAND_MAX] = max( min( side_gain[b + STEREO_DFT_BAND_MAX], 1 ), -1 );

            /* for residual prediction gain, allowed range is [0, 1]*/

            res_pred_gain[b] = diffuseness[b] * ( 1.0f - surrCoh[b] );

            res_pred_gain[b] = max( min( res_pred_gain[b], 1 ), 0 );

            res_pred_gain[b + STEREO_DFT_BAND_MAX] = diffuseness[b] * ( 1.0f - surrCoh[b] );

            res_pred_gain[b + STEREO_DFT_BAND_MAX] = max( min( res_pred_gain[b + STEREO_DFT_BAND_MAX], 1 ), 0 );

#else

            side_gain[b] *= sqrtf( 1.f - diffuseness[b] );

            side_gain[b + STEREO_DFT_BAND_MAX] *= sqrtf( 1.f - diffuseness[b] );

            res_pred_gain[b] = diffuseness[b] * ( 1.0f - surrCoh[b] );

            res_pred_gain[b + STEREO_DFT_BAND_MAX] = diffuseness[b] * ( 1.0f - surrCoh[b] );

#endif

        }

    }