Commit ab9a3489 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_706_REND_COMPLEXITY_LEVELS

parent 1966afe7

apps/renderer.c

+0 −8
Original line number Diff line number Diff line
@@ -174,9 +174,7 @@ typedef struct 
    int8_t orientation_tracking;

    int16_t nonDiegeticPan;

    float nonDiegeticPanGain;

#ifdef FIX_706_REND_COMPLEXITY_LEVELS

    IVAS_REND_COMPLEXITY_LEVEL complexityLevel;

#endif

    bool delayCompensationEnabled;

    bool quietModeEnabled;

    bool sceneDescriptionInput;
@@ -208,9 +206,7 @@ typedef enum 
    CmdLnOptionId_orientationTracking,

    CmdlnOptionId_lfePosition,

    CmdlnOptionId_lfeMatrix,

#ifdef FIX_706_REND_COMPLEXITY_LEVELS

    CmdLnOptionId_complexityLevel,

#endif

    CmdLnOptionId_noDelayCmp,

    CmdLnOptionId_quietModeEnabled,

    CmdLnOptionId_inputMetadata,
@@ -335,14 +331,12 @@ static const CmdLnParser_Option cliOptions[] = { 
        .matchShort = "ndc",

        .description = "[flag] Turn off delay compensation",

    },

#ifdef FIX_706_REND_COMPLEXITY_LEVELS

    {

        .id = CmdLnOptionId_complexityLevel,

        .match = "complexity_level",

        .matchShort = "level",

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

    },

#endif

    {

        .id = CmdLnOptionId_quietModeEnabled,

        .match = "quiet",
@@ -2659,7 +2653,6 @@ static void parseOption( 
            strncpy( args->inLfePanningMatrixFile, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            args->lfeCustomRoutingEnabled = true;

            break;

#ifdef FIX_706_REND_COMPLEXITY_LEVELS

        case CmdLnOptionId_complexityLevel:

            assert( numOptionValues == 1 );

            args->complexityLevel = (int32_t) ( strtol( optionValues[0], NULL, 10 ) );
@@ -2673,7 +2666,6 @@ static void parseOption( 
                fprintf( stdout, "Complexity levels 1 and 2 will be defined after characterisation - default to level 3 (full functionality).\n" );

            }

            break;

#endif

        case CmdLnOptionId_noDelayCmp:

            assert( numOptionValues == 0 );

            args->delayCompensationEnabled = false;

lib_com/options.h

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






#define FIX_706_REND_COMPLEXITY_LEVELS                  /* VoiceAge: Implement complexity levels to renderer */





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

lib_rend/lib_rend.h

+0 −2
Original line number Diff line number Diff line
@@ -120,14 +120,12 @@ typedef enum 


typedef uint16_t IVAS_REND_InputId;



#ifdef FIX_706_REND_COMPLEXITY_LEVELS

typedef enum _IVAS_REND_COMPLEXITY_LEVEL

{

    IVAS_REND_COMPLEXITY_LEVEL_ONE = 1,

    IVAS_REND_COMPLEXITY_LEVEL_TWO = 2,

    IVAS_REND_COMPLEXITY_LEVEL_THREE = 3

} IVAS_REND_COMPLEXITY_LEVEL;

#endif





/* clang-format off */