Commit 1966afe7 authored by multrus's avatar multrus
Browse files

[cleanup] accept API_5MS

parent 68332aa2

apps/decoder.c

+0 −8
Original line number Diff line number Diff line
@@ -145,9 +145,7 @@ typedef struct 
#endif

    uint16_t acousticEnvironmentId;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

#ifdef API_5MS

    bool framing_5ms;

#endif

} DecArguments;
@@ -970,9 +968,7 @@ static bool parseCmdlIVAS_dec( 
    arg->delayCompensationEnabled = true;

    arg->voipMode = false;

    arg->complexityLevel = IVAS_DEC_COMPLEXITY_LEVEL_THREE;

#ifdef API_5MS

    arg->framing_5ms = false;

#endif



    arg->enableHeadRotation = false;

    arg->headrotTrajFileName = NULL;
@@ -1219,14 +1215,12 @@ static bool parseCmdlIVAS_dec( 
            arg->inputFormat = IVAS_DEC_INPUT_FORMAT_MIME;

            i++;

        }

#ifdef API_5MS

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

        {

            arg->framing_5ms = true;

            fprintf( stderr, "Warning: this is a placeholder for 5ms framing.\n" );

            i++;

        }

#endif

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

        {

            arg->enableHeadRotation = true;
@@ -1561,9 +1555,7 @@ static void usage_dec( void ) 
    fprintf( stdout, "-VOIP_framesize     : VoIP mode: acoustic frontend fetch frame size (must be multiples of 5!)\n" );

#endif

#endif

#ifdef API_5MS

    fprintf( stdout, "-fr5                : option to perform rendering + head-tracking with 5ms frame size\n" );

#endif

    fprintf( stdout, "-fec_cfg_file       : Optimal channel aware configuration computed by the JBM   \n" );

    fprintf( stdout, "                      as described in Section 6.3.1 of TS26.448. The output is \n" );

    fprintf( stdout, "                      written into a .txt file. Each line contains the FER indicator \n" );

apps/renderer.c

+0 −10
Original line number Diff line number Diff line
@@ -188,9 +188,7 @@ typedef struct 
    bool lfeCustomRoutingEnabled;

    char inLfePanningMatrixFile[RENDERER_MAX_CLI_ARG_LENGTH];

    float syncMdDelay;

#ifdef API_5MS

    bool framing_5ms;

#endif

    uint16_t directivityPatternId[RENDERER_MAX_ISM_INPUTS];

    uint16_t acousticEnvironmentId;

} CmdlnArgs;
@@ -224,9 +222,7 @@ typedef enum 
#endif

    CmdLnOptionId_referenceVectorFile,

    CmdLnOptionId_exteriorOrientationFile,

#ifdef API_5MS

    CmdLnOptionId_framing5ms,

#endif

    CmdLnOptionId_syncMdDelay,

    CmdLnOptionId_directivityPatternId,

    CmdLnOptionId_acousticEnvironmentId
@@ -377,14 +373,12 @@ static const CmdLnParser_Option cliOptions[] = { 
        .matchShort = "exof",

        .description = "External orientation trajectory file for simulation of external orientations",

    },

#ifdef API_5MS

    {

        .id = CmdLnOptionId_framing5ms,

        .match = "framing_5ms",

        .matchShort = "fr5",

        .description = "Render audio with 5 ms framing.",

    },

#endif

    {

        .id = CmdLnOptionId_syncMdDelay,

        .match = "sync_md_delay",
@@ -2534,9 +2528,7 @@ static CmdlnArgs defaultArgs( 


    args.lfeCustomRoutingEnabled = false;

    clearString( args.inLfePanningMatrixFile );

#ifdef API_5MS

    args.framing_5ms = false;

#endif

    args.syncMdDelay = 0;



    for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
@@ -2699,13 +2691,11 @@ static void parseOption( 
                exit( -1 );

            }

            break;

#ifdef API_5MS

        case CmdLnOptionId_framing5ms:

            assert( numOptionValues == 0 );

            args->framing_5ms = true;

            fprintf( stderr, "Warning: this is a placeholder for 5ms framing.\n" );

            break;

#endif

        case CmdLnOptionId_directivityPatternId:

            assert( numOptionValues <= RENDERER_MAX_ISM_INPUTS );

            for ( int16_t i = 0; i < numOptionValues; ++i )

lib_com/options.h

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






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

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