Commit d5d4ccd5 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

remove complexity level from ISAR post-renderer

parent ff351d0a

apps/isar_post_rend.c

+0 −32
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ typedef struct 
    char inMetadataFilePath[POST_REND_MAX_CLI_ARG_LENGTH];

    char headRotationFilePath[POST_REND_MAX_CLI_ARG_LENGTH];

    char splitRendBFIFilePath[POST_REND_MAX_CLI_ARG_LENGTH];

    ISAR_POST_REND_COMPLEXITY_LEVEL complexityLevel;

    bool delayCompensationEnabled;

    bool quietModeEnabled;

    IVAS_RENDER_NUM_SUBFR render_num_subframes;
@@ -122,7 +121,6 @@ typedef enum 
    CmdLnOptionId_outputFile,

    CmdLnOptionId_sampleRate,

    CmdLnOptionId_trajFile,

    CmdLnOptionId_complexityLevel,

    CmdLnOptionId_noDelayCmp,

    CmdLnOptionId_quietModeEnabled,

    CmdLnOptionId_inputMetadata,
@@ -192,13 +190,6 @@ static const CmdLnParser_Option cliOptions[] = { 
        .matchShort = "no_delay_cmp",

        .description = "Turn off delay compensation",

    },

    {

        .id = CmdLnOptionId_complexityLevel,

        .match = "complexity_level",

        .matchShort = "level",

        .placeholder = "<level>",

        .description = "Complexity level (1, 2, 3) - will be defined after characterisation",

    },

    {

        .id = CmdLnOptionId_quietModeEnabled,

        .match = "quiet",
@@ -432,7 +423,6 @@ static CmdlnArgs defaultArgs( 
    clearString( args.headRotationFilePath );

    clearString( args.splitRendBFIFilePath );



    args.complexityLevel = ISAR_POST_REND_COMPLEXITY_LEVEL_THREE;

    args.delayCompensationEnabled = true;

    args.quietModeEnabled = false;
@@ -546,28 +536,6 @@ static int16_t parseOption( 
            }

            strncpy( args->splitRendBFIFilePath, optionValues[0], POST_REND_MAX_CLI_ARG_LENGTH - 1 );

            break;

        case CmdLnOptionId_complexityLevel:

            if ( numOptionValues == 0 )

            {

                fprintf( stderr, "Error: No complexity level has been provided!\n" );

                return -1;

            }

            else if ( numOptionValues > 1 )

            {

                fprintf( stderr, "Error: The program expects a single complexity level, but %d have been provided!\n", numOptionValues );

                return -1;

            }

            args->complexityLevel = (int32_t) ( strtol( optionValues[0], NULL, 10 ) );

            if ( args->complexityLevel < ISAR_POST_REND_COMPLEXITY_LEVEL_ONE || args->complexityLevel > ISAR_POST_REND_COMPLEXITY_LEVEL_THREE )

            {

                fprintf( stderr, "Error: Invalid complexity level specified.\n" );

                return -1;

            }

            else if ( args->complexityLevel == ISAR_POST_REND_COMPLEXITY_LEVEL_ONE || args->complexityLevel == ISAR_POST_REND_COMPLEXITY_LEVEL_TWO )

            {

                fprintf( stderr, "Complexity levels 1 and 2 will be defined after characterisation - default to level 3 (full functionality).\n" );

            }

            break;

        case CmdLnOptionId_noDelayCmp:

            if ( numOptionValues != 0 )

            {

lib_isar/lib_isar_post_rend.h

+0 −8
Original line number Diff line number Diff line
@@ -82,14 +82,6 @@ typedef struct ISAR_POST_REND const *ISAR_POST_REND_CONST_HANDLE; 


typedef UWord16 ISAR_POST_REND_InputId;



typedef enum _ISAR_POST_REND_COMPLEXITY_LEVEL

{

    ISAR_POST_REND_COMPLEXITY_LEVEL_ONE = 1,

    ISAR_POST_REND_COMPLEXITY_LEVEL_TWO = 2,

    ISAR_POST_REND_COMPLEXITY_LEVEL_THREE = 3

} ISAR_POST_REND_COMPLEXITY_LEVEL;





/* clang-format off */

/*----------------------------------------------------------------------------------*

 * ISAR post-renderer function prototypes