Commit 3d3001bd authored by TYAGIRIS's avatar TYAGIRIS
Browse files

fix 5ms path issue due to duplicate CMD line parsing

parent e9b60c2e

apps/decoder.c

+15 −17
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ typedef struct 
#endif

    uint16_t acousticEnvironmentId;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

    bool framing_5ms;

} DecArguments;
@@ -1058,7 +1057,6 @@ static bool parseCmdlIVAS_dec( 
    arg->delayCompensationEnabled = true;

    arg->voipMode = false;

    arg->complexityLevel = IVAS_DEC_COMPLEXITY_LEVEL_THREE;

    arg->framing_5ms = false;



    arg->enableHeadRotation = false;

    arg->headrotTrajFileName = NULL;
@@ -1319,12 +1317,6 @@ static bool parseCmdlIVAS_dec( 
            arg->inputFormat = IVAS_DEC_INPUT_FORMAT_MIME;

            i++;

        }

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

        {

            arg->framing_5ms = true;

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

            i++;

        }

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

        {

            arg->enableHeadRotation = true;
@@ -1341,7 +1333,7 @@ static bool parseCmdlIVAS_dec( 
            i++;

        }

#ifdef API_5MS_BASELINE

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

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

        {

            arg->enable5ms = true;

            i++;
@@ -2569,9 +2561,12 @@ static ivas_error decodeG192( 
                }

            }

        }



        frame++;

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

#ifdef API_5MS

        if ( needNewFrame )

        {

#endif

            frame++;

            if ( !arg.quietModeEnabled )

            {

                fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
@@ -2582,6 +2577,9 @@ static ivas_error decodeG192( 
                }

#endif

            }

#ifdef API_5MS

        }

#endif

#ifdef WMOPS

        if ( vec_pos_update == 0 )

        {