Commit adbb4b16 authored by Jan Kiene's avatar Jan Kiene
Browse files

add complexity level placeholder in decoder

parent c2b27b4e

apps/decoder.c

+29 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ typedef struct 
    float no_diegetic_pan;

    bool renderConfigEnabled;

    char *renderConfigFilename;

#ifdef COMPLEXITY_LEVEL_INDICATION

    IVAS_DEC_COMPLEXITY_LEVEL complexityLevel;

#endif



#ifdef DEBUGGING

    IVAS_DEC_FORCED_REND_MODE forcedRendMode;
@@ -757,6 +760,9 @@ static bool parseCmdlIVAS_dec( 
    arg->quietModeEnabled = false;

    arg->delayCompensationEnabled = true;

    arg->voipMode = false;

#ifdef COMPLEXITY_LEVEL_INDICATION

    arg->complexityLevel = IVAS_DEC_COMPLEXITY_LEVEL_THREE;

#endif



    arg->enableHeadRotation = false;

    arg->headrotTrajFileName = NULL;
@@ -1051,6 +1057,25 @@ static bool parseCmdlIVAS_dec( 
            }

            i++;

        }

#ifdef COMPLEXITY_LEVEL_INDICATION

        else if ( strcmp( argv_to_upper, "-LEVEL" ) == 0 )

        {

            int16_t level;



            ++i;

            level = atoi( argv[i++] );

            if ( level < IVAS_DEC_COMPLEXITY_LEVEL_ONE || level > IVAS_DEC_COMPLEXITY_LEVEL_THREE )

            {

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

                usage_dec();

                return false;

            }

            else if ( level == IVAS_DEC_COMPLEXITY_LEVEL_ONE || level == IVAS_DEC_COMPLEXITY_LEVEL_TWO )

            {

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

            }

        }

#endif



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

         * Option not recognized
@@ -1202,6 +1227,10 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      containing FEC pattern (short values of 0 (good) or 1 (bad))\n" );

    fprintf( stdout, "                      default is OFF, if this option is not used\n" );

    fprintf( stdout, "-force R            : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),\n" );

#ifdef COMPLEXITY_LEVEL_INDICATION

    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

#endif

#endif

#ifdef DEBUG_MODE_INFO

#ifdef DEBUG_MODE_INFO_TWEAK

lib_dec/lib_dec.h

+9 −0
Original line number Diff line number Diff line
@@ -77,6 +77,15 @@ typedef enum 
    IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF = 4, /* RTP payload: only Header-Full format without zero padding for size collision avoidance */

} IVAS_DEC_INPUT_FORMAT;



#ifdef COMPLEXITY_LEVEL_INDICATION

typedef enum _IVAS_DEC_COMPLEXITY_LEVEL

{

    IVAS_DEC_COMPLEXITY_LEVEL_ONE = 1,

    IVAS_DEC_COMPLEXITY_LEVEL_TWO = 2,

    IVAS_DEC_COMPLEXITY_LEVEL_THREE = 3

} IVAS_DEC_COMPLEXITY_LEVEL;

#endif



#ifdef DEBUGGING

typedef enum _IVAS_DEC_FORCED_REND_MODE

{