Commit cb7dd719 authored by bayers's avatar bayers
Browse files

Merge branch '5msAPI-with-default_20ms' of... 

Merge branch '5msAPI-with-default_20ms' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 5msAPI-with-default_20ms
parents f7392902 3d3001bd

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 )

        {

lib_dec/lib_dec.c

+2 −5
Original line number Diff line number Diff line
@@ -1739,10 +1739,7 @@ ivas_error IVAS_DEC_FeedHeadTrackData( 
    for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

    {

        /* check for Euler angle signaling */

<<<<<<< HEAD

        == == == =

        if ( orientation[i].w == -3.0f )

>>>>>>> main

        {

            Euler2Quat( deg2rad( orientation[i].x ), deg2rad( orientation[i].y ), deg2rad( orientation[i].z ), &orientation[i] );

        }
@@ -2067,7 +2064,7 @@ static ivas_error copyRendererConfigStruct( RENDER_CONFIG_HANDLE hRCin, IVAS_REN 
    mvr2r( hRCin->roomAcoustics.pFc_input, hRCout->room_acoustics.pFc_input, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->roomAcoustics.pAcoustic_rt60, hRCout->room_acoustics.pAcoustic_rt60, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->roomAcoustics.pAcoustic_dsr, hRCout->room_acoustics.pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX );

    mvr2r( hRCin->directivity, hRCout->directivity, 3 );

    mvr2r( hRCin->directivity, hRCout->directivity, 3 * MAX_NUM_OBJECTS );

#ifdef SPLIT_REND_WITH_HEAD_ROT

    hRCout->split_rend_config.splitRendBitRate = SPLIT_REND_768k;

    hRCout->split_rend_config.dof = 3;