Commit 3a1651ba authored by norvell's avatar norvell
Browse files

Merge branch '357-dtx-for-unified-stereo-32000bps' into 'main' 

[Non-BE] Enable FD-CNG for 32000 bps unified stereo dtx

See merge request !463
parents bc0f1537 d0170f08

lib_com/options.h

100644 → 100755
+1 −0
Original line number Diff line number Diff line
@@ -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 */

lib_enc/dtx.c

+4 −0
Original line number Diff line number Diff line
@@ -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 ) )

                {