Commit 90693484 authored by vaclav's avatar vaclav
Browse files

Merge branch '1353_ref_PortFlpMR1260' into 'float-pc' 

Port float MR1260 to BASOP FLP ref

See merge request !1233
parents 2fd2cf58 4b863372

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ 
#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#endif



#define NONBE_FIX_855_JBM_FLUSH_OFFSET                  /* FhG: issue #855: add missing switch here for the code in JBM flushing  */

#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */



/* #################### End BASOP porting switches ############################ */

lib_util/cmdln_parser.c

+19 −0
Original line number Diff line number Diff line
@@ -150,7 +150,26 @@ static int8_t optionMatchesString( 


    const char *optionName = stringToOptionName( str );



#ifdef FIX_923_EXTERNAL_REND_COMMAND_LINE

    char optionName_to_upper[FILENAME_MAX];

    strncpy( optionName_to_upper, optionName, sizeof( optionName_to_upper ) - 1 );

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

    to_upper( optionName_to_upper );



    char match_to_upper[FILENAME_MAX];

    strncpy( match_to_upper, opt.props.match, sizeof( match_to_upper ) - 1 );

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

    to_upper( match_to_upper );



    char matchShort_to_upper[FILENAME_MAX];

    strncpy( matchShort_to_upper, opt.props.matchShort, sizeof( matchShort_to_upper ) - 1 );

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

    to_upper( matchShort_to_upper );



    if ( strncmp( optionName_to_upper, match_to_upper, MAX_OPTION_LENGTH ) == 0 || strncmp( optionName_to_upper, matchShort_to_upper, MAX_OPTION_LENGTH ) == 0 )

#else

    if ( strncmp( optionName, opt.props.match, MAX_OPTION_LENGTH ) == 0 || strncmp( optionName, opt.props.matchShort, MAX_OPTION_LENGTH ) == 0 )

#endif

    {

        return 1;

    }