Commit 4664c0de authored by eichenseer's avatar eichenseer
Browse files

Merge branch 'main' into 440-fix-for-directional-background-noise-becoming-diffuse-in-paramism

parents 5cfa3ffe 6e9cf7fa

apps/encoder.c

+13 −0
Original line number Diff line number Diff line
@@ -1130,18 +1130,31 @@ static bool parseCmdlIVAS_enc( 
            {

                strncpy( stmp, argv[i], sizeof( stmp ) );

                stmp[sizeof( stmp ) - 1] = '\0';

#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING

                to_upper( stmp );

                if ( strcmp( stmp, "LO" ) == 0 )

#else

                to_upper( argv[i] );

                if ( strcmp( argv[i], "LO" ) == 0 )

#endif

                {

                    arg->caConfig.fec_indicator = IVAS_ENC_FEC_LO;

                }

#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING

                else if ( strcmp( stmp, "HI" ) == 0 )

#else

                else if ( strcmp( argv[i], "HI" ) == 0 )

#endif

                {

                    arg->caConfig.fec_indicator = IVAS_ENC_FEC_HI;

                }

                else

                {

#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING

                    arg->ca_config_file = argv[i];

#else

                    arg->ca_config_file = stmp;

#endif

                }

                i++;

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -174,9 +174,12 @@ 
#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 */



#define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING         /* Eri: Fix incorrect use of stack variable used for channel aware config file */



#define FIX_440_PARAM_ISM_DIR_NOISE                     /* FhG: Issue 440: Fix directional background noise becoming diffuse in ParamISM */



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

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 ) )

                {