diff --git a/lib_com/options.h b/lib_com/options.h index 8b22dc430b84cf629e28cebd799f8d538207ae4a..23f991793e03078e44794c7b8d7e1b49d803d1c9 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -162,7 +162,7 @@ #define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */ #define FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE /* VA: issue 1228: Exit the processing when a HRTF binary file with wrong sampling rate is provided */ #define FIX_1225_DISCLAIMER /* VA: issue 1225: Add disclaimer for external renderer + Add info about IVAS reference version */ - +#define FIX_1179_USAN_PHASEECU /* Eri: issue 1179: better handling of 16 bit wrap around for very long(>200ms) FER-bursts */ /* #################### End BE switches ################################## */ /* #################### Start NON-BE switches ############################ */ diff --git a/lib_dec/FEC_HQ_phase_ecu.c b/lib_dec/FEC_HQ_phase_ecu.c index 425ff21fe97a693c36a11f224bfd4b6366fc0ab3..a500166677e6702bee12634bbdda9e17477a93f9 100644 --- a/lib_dec/FEC_HQ_phase_ecu.c +++ b/lib_dec/FEC_HQ_phase_ecu.c @@ -2089,6 +2089,12 @@ static void hq_phase_ecu( if ( !prev_bfi || ( prev_bfi && *last_fec && ( *time_offs == output_frame ) ) ) { +#ifdef FIX_1179_USAN_PHASEECU + if ( !( prev_bfi && *last_fec && ( element_mode == EVS_MONO ) ) ) + { + *time_offs = 0; /* IVAS reset of offset time counter, timeoffset variable later also used to calculate burst length */ + } +#else if ( prev_bfi && *last_fec && element_mode == EVS_MONO ) { *time_offs += 0; @@ -2097,22 +2103,46 @@ static void hq_phase_ecu( { *time_offs = 0; } +#endif trans_ana( prevsynth + 2 * output_frame - Lprot - *time_offs + ph_ecu_lookahead, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab, *last_fec, alpha, beta, beta_mute, Xavg ); spec_ana( prevsynth + 2 * output_frame - Lprot - *time_offs + ph_ecu_lookahead, plocs, plocsi, num_p, X_sav, output_frame, bwidth, element_mode, &noise_fac, pcorr ); if ( prev_bfi && *last_fec ) { +#ifdef FIX_1179_USAN_PHASEECU + if ( element_mode != EVS_MONO ) + { + *time_offs = (int16_t) ( *time_offs + output_frame ); /* USAN avoid risk of internal int32_t in "+=" */ + if ( *time_offs <= 0 ) + { /* detected wrap around of st->time_offs */ + *time_offs = (int16_t) INT16_MAX; /* keep a very high value so that the long term muting stays on */ + } + } + else + { + *time_offs = (int16_t) ( *time_offs + output_frame ); /* EVS_MONO BE compatible, but EVS CR needed as wrap will cause burst length muting envelope instability issues */ + } +#else *time_offs += output_frame; +#endif } } else { +#ifdef FIX_1179_USAN_PHASEECU + *time_offs = (int16_t) ( *time_offs + output_frame ); /* cast added for USAN, "+=" avoided as it may creat a truncation from int to int16_t */ +#else *time_offs += output_frame; +#endif if ( *time_offs <= 0 ) { /* detect wrap around of st->time_offs */ - *time_offs = MAX16B; /* continued muting will ensure that the now fixed seeds are not creating tones */ +#ifdef FIX_1179_USAN_PHASEECU + *time_offs = (int16_t) INT16_MAX; /* high value --> continued muting will ensure that the now saturated seed is not creating tones */ +#else + *time_offs = MAX16B; +#endif } trans_ana( prevsynth + 2 * output_frame - Lprot, mag_chg, &ph_dith, mag_chg_1st, output_frame, *time_offs, env_stab, 0, alpha, beta, beta_mute, Xavg ); /* 1.0 stable-music, 0.0 speech-like */ @@ -2124,7 +2154,11 @@ static void hq_phase_ecu( seed = *time_offs; if ( *num_p > 0 ) { +#ifdef FIX_1179_USAN_PHASEECU + seed = (int16_t) ( seed + plocs[*num_p - 1] ); /* explicit cast and "+=" not used, as it "+=" may create a cast from 32 bit to 16 bit, triggering USAN */ +#else seed += plocs[*num_p - 1]; +#endif } subst_spec( plocs, plocsi, num_p, *time_offs, X, mag_chg, ph_dith, old_is_transient, output_frame, &seed, alpha, beta, *beta_mute, Xavg, element_mode, ph_ecu_lookahead, noise_fac );