Commit 1173116f authored by vaclav's avatar vaclav
Browse files

harmonize parameter names; add "const" to fucntion input parameters

parent 7effe8d1

apps/decoder.c

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ int main( 
    /*------------------------------------------------------------------------------------------*

     * Open decoder handle

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



#ifdef FIX_439_OTR_PARAMS

    if ( ( error = IVAS_DEC_Open( &hIvasDec, arg.decMode, arg.no_diegetic_pan ) ) != IVAS_ERR_OK )

#else

apps/renderer.c

+24 −7
Original line number Diff line number Diff line
@@ -135,7 +135,11 @@ typedef struct 
    char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#ifdef FIX_439_OTR_PARAMS

    int8_t orientation_tracking;

#else

    int8_t orientationTracking;

#endif

    float noDiegeticPan;

    bool delayCompensationEnabled;

    bool quietModeEnabled;
@@ -708,7 +712,11 @@ int main( 
        }

    }



#ifdef FIX_439_OTR_PARAMS

    if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientation_tracking ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientationTracking ) ) != IVAS_ERR_OK )

#endif

    {

        return error;

    }
@@ -1367,7 +1375,12 @@ static bool parseDiegeticPan( 


static bool parseOrientationTracking(

    char *value,

    int8_t *tracking_type )

#ifdef FIX_439_OTR_PARAMS

    int8_t *orientation_tracking

#else

    int8_t *tracking_type

#endif

)

{



    to_upper( value );
@@ -1375,7 +1388,7 @@ static bool parseOrientationTracking( 
    if ( strcmp( value, "NONE" ) == 0 )

    {

#ifdef FIX_439_OTR_PARAMS

        *tracking_type = HEAD_ORIENT_TRK_NONE;

        *orientation_tracking = HEAD_ORIENT_TRK_NONE;

#else

        *tracking_type = IVAS_ORIENT_TRK_NONE;

#endif
@@ -1383,7 +1396,7 @@ static bool parseOrientationTracking( 
    else if ( strcmp( value, "REF" ) == 0 )

    {

#ifdef FIX_439_OTR_PARAMS

        *tracking_type = HEAD_ORIENT_TRK_REF;

        *orientation_tracking = HEAD_ORIENT_TRK_REF;

#else

        *tracking_type = IVAS_ORIENT_TRK_REF;

#endif
@@ -1391,7 +1404,7 @@ static bool parseOrientationTracking( 
    else if ( strcmp( value, "AVG" ) == 0 )

    {

#ifdef FIX_439_OTR_PARAMS

        *tracking_type = HEAD_ORIENT_TRK_AVG;

        *orientation_tracking = HEAD_ORIENT_TRK_AVG;

#else

        *tracking_type = IVAS_ORIENT_TRK_AVG;

#endif
@@ -1399,7 +1412,7 @@ static bool parseOrientationTracking( 
    else if ( strcmp( value, "REF_VEC" ) == 0 )

    {

#ifdef FIX_439_OTR_PARAMS

        *tracking_type = HEAD_ORIENT_TRK_REF_VEC;

        *orientation_tracking = HEAD_ORIENT_TRK_REF_VEC;

#else

        *tracking_type = IVAS_ORIENT_TRK_REF_VEC;

#endif
@@ -1407,7 +1420,7 @@ static bool parseOrientationTracking( 
    else if ( strcmp( value, "REF_VEC_LEV" ) == 0 )

    {

#ifdef FIX_439_OTR_PARAMS

        *tracking_type = HEAD_ORIENT_TRK_REF_VEC_LEV;

        *orientation_tracking = HEAD_ORIENT_TRK_REF_VEC_LEV;

#else

        *tracking_type = IVAS_ORIENT_TRK_REF_VEC_LEV;

#endif
@@ -1635,7 +1648,7 @@ static CmdlnArgs defaultArgs( 
    clearString( args.renderConfigFilePath );



#ifdef FIX_439_OTR_PARAMS

    args.orientationTracking = HEAD_ORIENT_TRK_NONE;

    args.orientation_tracking = HEAD_ORIENT_TRK_NONE;

#else

    args.orientationTracking = IVAS_ORIENT_TRK_NONE;

#endif
@@ -1739,7 +1752,11 @@ static void parseOption( 
            break;

        case CmdLnOptionId_orientationTracking:

            assert( numOptionValues == 1 );

#ifdef FIX_439_OTR_PARAMS

            if ( !parseOrientationTracking( optionValues[0], &args->orientation_tracking ) )

#else

            if ( !parseOrientationTracking( optionValues[0], &args->orientationTracking ) )

#endif

            {

                fprintf( stderr, "Unknown option for orientation tracking: %s\n", optionValues[0] );

                exit( -1 );

lib_dec/lib_dec.c

+5 −5
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ ivas_error IVAS_DEC_Configure( 
    const int16_t hrtfReaderEnabled,          /* i  : enable HRTF binary file input              */

    const int16_t enableHeadRotation,         /* i  : enable head rotation for binaural output   */

#ifdef FIX_439_OTR_PARAMS

    HEAD_ORIENT_TRK_T orientationTracking,    /* i  : head orientation tracking mode             */

    const HEAD_ORIENT_TRK_T orientation_tracking, /* i  : head orientation tracking type             */

#endif

    const int16_t renderConfigEnabled /* i  : enable Renderer config. file for binaural output */

)
@@ -453,7 +453,7 @@ ivas_error IVAS_DEC_Configure( 
    hDecoderConfig->Opt_LsCustom = customLsOutputEnabled;

    hDecoderConfig->Opt_Headrotation = enableHeadRotation;

#ifdef FIX_439_OTR_PARAMS

    hDecoderConfig->orientation_tracking = orientationTracking;

    hDecoderConfig->orientation_tracking = orientation_tracking;

#endif

    hDecoderConfig->Opt_HRTF_binary = hrtfReaderEnabled;

    hDecoderConfig->Opt_RendConfigCustom = renderConfigEnabled;

lib_dec/lib_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ ivas_error IVAS_DEC_Configure( 
    const int16_t hrtfReaderEnabled,            /* i  : enable HRTF binary file input                                           */

    const int16_t enableHeadRotation,           /* i  : enable head rotation for binaural output                                */

#ifdef FIX_439_OTR_PARAMS

    HEAD_ORIENT_TRK_T  orientationTracking,     /* i  : head orientation tracking mode                                          */

    const HEAD_ORIENT_TRK_T orientation_tracking,     /* i  : head orientation tracking type                                          */

#endif

    const int16_t renderConfigEnabled           /* i  : enable Renderer config. file for binaural output                        */

);

lib_rend/ivas_orient_trk.c

+21 −3
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ ivas_error ivas_orient_trk_Init( 


    /* set safe default tracking mode */

#ifdef FIX_439_OTR_PARAMS

    pOTR->trackingType = HEAD_ORIENT_TRK_NONE;

    pOTR->orientation_tracking = HEAD_ORIENT_TRK_NONE;

#else

    pOTR->trackingType = OTR_TRACKING_NONE;

#endif
@@ -425,7 +425,7 @@ ivas_error ivas_orient_trk_Init( 
ivas_error ivas_orient_trk_SetTrackingType(

    ivas_orient_trk_state_t *pOTR, /* i/o: orientation tracker handle    */

#ifdef FIX_439_OTR_PARAMS

    HEAD_ORIENT_TRK_T trackingType    /* i/o: orientation tracking type     */

    const HEAD_ORIENT_TRK_T orientation_tracking /* i  : orientation tracking type     */

#else

    const OTR_TRACKING_T trackingType /* i/o: orientation tracking type     */

#endif
@@ -435,7 +435,12 @@ ivas_error ivas_orient_trk_SetTrackingType( 
    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



#ifdef FIX_439_OTR_PARAMS

    pOTR->orientation_tracking = orientation_tracking;

#else

    pOTR->trackingType = trackingType;

#endif



    return IVAS_ERR_OK;

}
@@ -485,7 +490,12 @@ ivas_error ivas_orient_trk_GetMainOrientation( 
    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



#ifdef FIX_439_OTR_PARAMS

    switch ( pOTR->orientation_tracking )

#else

    switch ( pOTR->trackingType )

#endif

    {

#ifdef FIX_439_OTR_PARAMS

        case HEAD_ORIENT_TRK_NONE:
@@ -561,7 +571,11 @@ ivas_error ivas_orient_trk_SetReferenceVector( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



#ifdef FIX_439_OTR_PARAMS

    switch ( pOTR->orientation_tracking )

#else

    switch ( pOTR->trackingType )

#endif

    {

#ifdef FIX_439_OTR_PARAMS

        case HEAD_ORIENT_TRK_NONE:
@@ -638,7 +652,11 @@ ivas_error ivas_orient_trk_Process( 


    result = IVAS_ERR_OK;



#ifdef FIX_439_OTR_PARAMS

    switch ( pOTR->orientation_tracking )

#else

    switch ( pOTR->trackingType )

#endif

    {

#ifdef FIX_439_OTR_PARAMS

        case HEAD_ORIENT_TRK_NONE: