Commit 6e9cf7fa authored by kinuthia's avatar kinuthia
Browse files

Merge branch '411-evs-be-tests-on-windows-failing' into 'main' 

Fix EVS BE when channel aware config file is used

See merge request !616
parents 3a1651ba d79a617c

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

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ 
#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 */



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

/* clang-format on */

#endif