Commit 88044861 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING

parent cba6282b

apps/encoder.c

+0 −13
Original line number Diff line number Diff line
@@ -1136,31 +1136,18 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ 


#define HR_METADATA                                     /* Nok: Contribution #45: encode directional MASA metadata with more bits at 384k and 512k */



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

#define COMBINED_FORMAT_SIGNALING                       /* VA: Introduce a signaling bit for combined format coding */

#define FIX_446_STEREO_DMX_CRASH                        /* FhG: fix discrepancy with EVS code that could cause crashes in rare cases */