diff --git a/lib_com/options.h b/lib_com/options.h old mode 100644 new mode 100755 index 9fe797240d1cdaa787a3e8549aa766cb14f761ff..1429f24a756dd31c34da7a9968783049407ad73b --- a/lib_com/options.h +++ b/lib_com/options.h @@ -174,6 +174,7 @@ #define EUALER2QUAT_FIX /*Dlb :fix for issue 430 issue in euler2quat, sign of quat y is inverted*/ #define HR_METADATA /* Nok: encode directional MASA metadata with more bits at 384k and 512k */ +#define FIX_357_DTX_32K /* Eri: issue 357 - Forced LP-CNG at 32k */ #define FIX_435_ISM_MERGE_BUG /* Eri: Merge bug fix for ISM NULL metadata and tcx_only cases */ #define FIX_355_REFACTOR_PARAMBIN_TO_5MS /* Nokia: Fixes issue 355 by refactoring parametric binauralizer code to 5 ms mode */ diff --git a/lib_enc/dtx.c b/lib_enc/dtx.c index b414347dcb810e394678af03ef4b7587e85ada1f..08d4316750868e4b72df31b8bf6ec6a11e393a84 100644 --- a/lib_enc/dtx.c +++ b/lib_enc/dtx.c @@ -238,7 +238,11 @@ void dtx( } else { +#ifdef FIX_357_DTX_32K + if ( ( st->cng_type == FD_CNG && ( st->total_brate <= MAX_BRATE_DTX_EVS || ( st->element_mode != EVS_MONO && ivas_total_brate <= MAX_BRATE_DTX_IVAS ) ) ) || ( st->element_mode == IVAS_CPE_MDCT ) ) /* at highest bitrates, use exclusively LP_CNG */ +#else if ( ( st->cng_type == FD_CNG && ( st->total_brate <= MAX_BRATE_DTX_EVS || ( st->element_mode == IVAS_SCE && ivas_total_brate <= MAX_BRATE_DTX_IVAS ) ) ) || ( st->element_mode == IVAS_CPE_MDCT ) ) /* at highest bitrates, use exclusively LP_CNG */ +#endif { if ( st->element_mode == EVS_MONO && ( st->total_brate == ACELP_9k60 || st->total_brate == ACELP_16k40 || st->total_brate == ACELP_24k40 ) ) {