Commit 8059b1f3 authored by stoutjesdijk's avatar stoutjesdijk 🎧
Browse files

add cmd line arguments

parent 367bc610

apps/renderer.c

+37 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ 
#include "cmdl_tools.h"

#include "cmdln_parser.h"

#include "head_rotation_file_reader.h"

#ifdef FIX_319_ADD_OTR_EXPORT

#include "head_rotation_file_writer.h"

#endif

#include "vector3_pair_file_reader.h"

#include "hrtf_file_reader.h"

#include "ism_file_reader.h"
@@ -131,6 +134,10 @@ typedef struct 
    char inMetadataFilePaths[RENDERER_MAX_ISM_INPUTS][RENDERER_MAX_CLI_ARG_LENGTH];

    int16_t numInMetadataFiles;

    char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#ifdef FIX_319_ADD_OTR_EXPORT

    char mainOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char trkRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#endif

    char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
@@ -158,6 +165,10 @@ typedef enum 
    CmdLnOptionId_sampleRate,

    CmdLnOptionId_trajFile,

    CmdLnOptionId_refRotFile,

#ifdef FIX_319_ADD_OTR_EXPORT

    CmdLnOptionId_mainOrientFile,

    CmdLnOptionId_trkRotFile,

#endif

    CmdLnOptionId_customHrtfFile,

    CmdLnOptionId_renderConfigFile,

    CmdLnOptionId_noDiegeticPan,
@@ -221,6 +232,20 @@ static const CmdLnParser_Option cliOptions[] = { 
        .matchShort = "rf",

        .description = "Reference rotation trajectory file for simulation of head tracking (only for BINAURAL and BINAURAL_ROOM outputs)",

    },

#ifdef FIX_319_ADD_OTR_EXPORT

    {

        .id = CmdLnOptionId_mainOrientFile,

        .match = "main_orientation_file",

        .matchShort = "mo",

        .description = "Main Orientation output file",

    },

    {

        .id = CmdLnOptionId_refRotFile,

        .match = "reference_rotation_file",

        .matchShort = "rr",

        .description = "Reference rotation output file",

    },

#endif

    {

        .id = CmdLnOptionId_customHrtfFile,

        .match = "custom_hrtf",
@@ -511,6 +536,10 @@ int main( 
{

    IVAS_REND_HANDLE hIvasRend;

    HeadRotFileReader *headRotReader = NULL;

#ifdef FIX_319_ADD_OTR_EXPORT

    HeadRotFileWriter *trkRotWriter = NULL;

    HeadRotFileWriter *mainOrientWriter = NULL;

#endif

    Vector3PairFileReader *referenceVectorReader = NULL;

    HeadRotFileReader *referenceRotReader = NULL;

    hrtfFileReader *hrtfFileReader = NULL;
@@ -1145,6 +1174,10 @@ int main( 
    AudioFileReader_close( &audioReader );

    AudioFileWriter_close( &audioWriter );

    HeadRotationFileReader_close( &headRotReader );

#ifdef FIX_319_ADD_OTR_EXPORT

    HeadRotationFileWriter_close( &mainOrientWriter );

    HeadRotationFileWriter_close( &trkRotWriter );

#endif

    Vector3PairFileReader_close( &referenceVectorReader );

    HeadRotationFileReader_close( &referenceRotReader );

    hrtfFileReader_close( &hrtfFileReader );
@@ -1609,6 +1642,10 @@ static CmdlnArgs defaultArgs( 
    args.numInMetadataFiles = 0;



    clearString( args.headRotationFilePath );

#ifdef FIX_319_ADD_OTR_EXPORT

    clearString( args.mainOrientationFilePath );

    clearString( args.trkRotationFilePath );

#endif

    clearString( args.referenceVectorFilePath );

    clearString( args.referenceRotationFilePath );

    clearString( args.customHrtfFilePath );

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ 
#define FIX_MDCT_BASED_BWD                              /* FhG: fixes for BWD for issues with reaction to transients for MDCT-stereo and MCT */

#define DISCRETE_ISM_DTX_CNG                            /* FhG/VA: contribution 15 - DTX/CNG for (discrete) ISM */

#define NCHAN_ISM_PARAMETER                             /* VA: make 'nchan_ism' parameter part of st_ivas/hEncoderConfig */

#define FIX_319_ADD_OTR_EXPORT                          /* Philips: add orientation tracking export to API */





#define FIX_382_MASA_META_FRAMING_ASYNC                 /* Nokia: Issue 382: detect potential MASA metadata framing offset */