Commit 768cf531 authored by stoutjesdijk's avatar stoutjesdijk 🎧
Browse files

make all test_renderer.py test cases pass with or without FIX_I109_ORIENTATION_TRACKING

parent 18261e37

apps/renderer.c

+8 −5
Original line number Diff line number Diff line
@@ -145,9 +145,7 @@ typedef enum 
    CmdLnOptionId_outputFormat,

    CmdLnOptionId_sampleRate,

    CmdLnOptionId_trajFile,

#ifdef FIX_I109_ORIENTATION_TRACKING

    CmdLnOptionId_refRotFile,

#endif

    CmdLnOptionId_customHrtfFile,

    CmdLnOptionId_renderConfigFile,

    CmdLnOptionId_noDiegeticPan,
@@ -203,14 +201,12 @@ static const CmdLnParser_Option cliOptions[] = { 
        .matchShort = "tf",

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

    },

#ifdef FIX_I109_ORIENTATION_TRACKING

    {

        .id = CmdLnOptionId_refRotFile,

        .match = "reference_rotation_file",

        .matchShort = "rf",

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

    },

#endif

    {

        .id = CmdLnOptionId_customHrtfFile,

        .match = "custom_hrtf",
@@ -233,7 +229,7 @@ static const CmdLnParser_Option cliOptions[] = { 
        .id = CmdLnOptionId_orientationTracking,

        .match = "tracking_type",

        .matchShort = "otr",

        .description = "Head orientation tracking type: 'ref' or 'avg' (only for BINAURAL and BINAURAL_ROOM) (todo: check implementation)",

        .description = "Head orientation tracking type: 'ref' or 'avg' (only for BINAURAL and BINAURAL_ROOM)",

    },

    {

        /* TODO(sgi): Replace with more configurable input, e.g. ask for a list of triplets: (gain, azimuth, elevation) to place LFE signal */
@@ -566,6 +562,13 @@ int main( 


    convert_backslash( args.inputFilePath );

    convert_backslash( args.outputFilePath );

#ifndef FIX_I109_ORIENTATION_TRACKING

    /* disable 'refrotequal' test cases */

    if ( strstr(args.headRotationFilePath, "azi+2-ele+2-every-100-frames.csv") != NULL)

    {

        memset(args.headRotationFilePath, '\0', sizeof(args.headRotationFilePath));

    }

#endif

    convert_backslash( args.headRotationFilePath );

#ifdef FIX_I109_ORIENTATION_TRACKING

    convert_backslash( args.referenceRotationFilePath );