Commit f8beb0bb authored by vaclav's avatar vaclav
Browse files

Merge branch '706-implement-complexity-levels-to-renderer' into 'main' 

Resolve "Implement complexity levels to renderer"

See merge request !963
parents f151a5b7 5251a096

apps/renderer.c

+29 −0
Original line number Diff line number Diff line
@@ -174,6 +174,9 @@ 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;
@@ -207,6 +210,9 @@ typedef enum 
    CmdLnOptionId_orientationTracking,

    CmdlnOptionId_lfePosition,

    CmdlnOptionId_lfeMatrix,

#ifdef FIX_706_REND_COMPLEXITY_LEVELS

    CmdLnOptionId_complexityLevel,

#endif

    CmdLnOptionId_noDelayCmp,

    CmdLnOptionId_quietModeEnabled,

    CmdLnOptionId_inputMetadata,
@@ -333,6 +339,14 @@ 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",
@@ -2654,6 +2668,21 @@ 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 ) );

            if ( args->complexityLevel < IVAS_REND_COMPLEXITY_LEVEL_ONE || args->complexityLevel > IVAS_REND_COMPLEXITY_LEVEL_THREE )

            {

                fprintf( stdout, "Invalid complexity level specified.\n" );

                exit( -1 );

            }

            else if ( args->complexityLevel == IVAS_REND_COMPLEXITY_LEVEL_ONE || args->complexityLevel == IVAS_REND_COMPLEXITY_LEVEL_TWO )

            {

                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

100755 → 100644
+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ 
#define FIX_LARGE_RENDERER_DELAY_COMP                   /* Fix renderer delay compensation with delays greater than 1 frame */



#define API_5MS                                         /*FhG, Dlb: add 5ms framing cmd line arg*/

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





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

lib_rend/lib_rend.h

+9 −0
Original line number Diff line number Diff line
@@ -120,6 +120,15 @@ 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 */

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