Commit dd4e471a authored by multrus's avatar multrus
Browse files

[cleanup] accept COMPLEXITY_LEVEL_INDICATION

parent 6404f586

apps/decoder.c

+0 −8
Original line number Diff line number Diff line
@@ -121,9 +121,7 @@ typedef struct 
    float non_diegetic_pan_gain;

    bool renderConfigEnabled;

    char *renderConfigFilename;

#ifdef COMPLEXITY_LEVEL_INDICATION

    IVAS_DEC_COMPLEXITY_LEVEL complexityLevel;

#endif



#ifdef DEBUGGING

    IVAS_DEC_FORCED_REND_MODE forcedRendMode;
@@ -815,9 +813,7 @@ 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;
@@ -1177,7 +1173,6 @@ static bool parseCmdlIVAS_dec( 
            }

            i++;

        }

#ifdef COMPLEXITY_LEVEL_INDICATION

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

        {

            int16_t level;
@@ -1195,7 +1190,6 @@ static bool parseCmdlIVAS_dec( 
                fprintf( stdout, "Complexity levels 1 and 2 will be defined after characterisation - default to level 3 (full functionality).\n" );

            }

        }

#endif



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

         * Option not recognized
@@ -1369,11 +1363,9 @@ 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

    fprintf( stdout, "-info <folder>      : specify subfolder name for debug output\n" );

apps/encoder.c

+0 −6
Original line number Diff line number Diff line
@@ -111,9 +111,7 @@ typedef struct 
    IVAS_ENC_CHANNEL_AWARE_CONFIG caConfig;

    const char *ca_config_file;

    bool mimeOutput;

#ifdef COMPLEXITY_LEVEL_INDICATION

    IVAS_ENC_COMPLEXITY_LEVEL complexityLevel;

#endif



#ifdef DEBUGGING

    IVAS_ENC_FORCED_MODE forcedMode;
@@ -881,9 +879,7 @@ static void initArgStruct( EncArguments *arg ) 
    arg->ca_config_file = NULL;

    arg->mimeOutput = false;

    arg->ism_extended_metadata = false;

#ifdef COMPLEXITY_LEVEL_INDICATION

    arg->complexityLevel = IVAS_ENC_COMPLEXITY_LEVEL_THREE;

#endif



#ifdef DEBUGGING

    arg->forcedMode = IVAS_ENC_FORCE_UNFORCED;
@@ -1184,7 +1180,6 @@ static bool parseCmdlIVAS_enc( 
        }





#ifdef COMPLEXITY_LEVEL_INDICATION

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

         * Complexity Level

         *-----------------------------------------------------------------*/
@@ -1207,7 +1202,6 @@ static bool parseCmdlIVAS_enc( 
                fprintf( stdout, "Complexity levels 1 and 2 will be defined after characterisation - default to level 3 (full functionality).\n" );

            }

        }

#endif



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

         * IVAS Formats

lib_com/options.h

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






#define COMPLEXITY_LEVEL_INDICATION

#define FIX_463_TD_RENDERER_DIRECTIVITY_RESET           /* Eri: Remove unintentional reset of directivity pattern */



#define FIX_642											/* FhG: Fix for issue 642, buggy DoA-array access in DirAC head rotation*/

lib_dec/lib_dec.h

+0 −2
Original line number Diff line number Diff line
@@ -76,14 +76,12 @@ 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 VARIABLE_SPEED_DECODING

lib_enc/lib_enc.h

+0 −2
Original line number Diff line number Diff line
@@ -94,14 +94,12 @@ typedef enum _IVAS_ENC_MASA_VARIANT 
    IVAS_ENC_MASA_UNDEFINED = 0xffff

} IVAS_ENC_MASA_VARIANT;



#ifdef COMPLEXITY_LEVEL_INDICATION

typedef enum _IVAS_ENC_COMPLEXITY_LEVEL

{

    IVAS_ENC_COMPLEXITY_LEVEL_ONE = 1,

    IVAS_ENC_COMPLEXITY_LEVEL_TWO = 2,

    IVAS_ENC_COMPLEXITY_LEVEL_THREE = 3

} IVAS_ENC_COMPLEXITY_LEVEL;

#endif



#ifdef DEBUGGING

typedef enum _IVAS_ENC_STEREO_MODE