Commit b7025b7e authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch '109-harmonize-head-and-orientation-tracking' of... 

Merge branch '109-harmonize-head-and-orientation-tracking' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 109-harmonize-head-and-orientation-tracking
parents 8c50b2b4 d7bfe621

apps/decoder.c

+6 −1
Original line number Diff line number Diff line
@@ -904,6 +904,7 @@ static bool parseCmdlIVAS_dec( 
        }

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

        {

#ifndef FIX_I109_ORIENTATION_TRACKING

            if ( strlen( argv[i + 1] ) > 3 )

            {

                fprintf( stderr, "Error: Invalid orientation tracking type %s \n\n", argv[i + 1] );
@@ -912,7 +913,9 @@ static bool parseCmdlIVAS_dec( 
            }

            char tmp[4];

            strcpy( tmp, argv[i + 1] );

#endif

#ifdef FIX_I109_ORIENTATION_TRACKING

            char *tmp = to_upper( argv[i + 1] );

            if ( strcmp( to_upper( tmp ), "NONE" ) == 0 )

            {

                arg->orientation_tracking = IVAS_PUBLIC_ORIENT_TRK_NONE;
@@ -1150,10 +1153,12 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      default is OFF, if this option is not used\n" );

    fprintf( stdout, "-force R            : Force specific binaural rendering mode, R = (TDREND, CLDFBREND),\n" );

#endif

    fprintf( stdout, "-otr tracking_type  : head orientation tracking type: 'ref' or 'avg'  (only for binaural rendering)\n" );

#ifdef FIX_I109_ORIENTATION_TRACKING

    fprintf( stdout, "-otr tracking_type  : head orientation tracking type: 'none', 'ref' or 'avg'  (only for binaural rendering)\n" );

    fprintf( stdout, "-rf File            : Reference rotation specified by external trajectory file\n" );

    fprintf( stdout, "                      works only in combination with -otr ref mode\n" );

#else

    fprintf( stdout, "-otr tracking_type  : head orientation tracking type: 'ref' or 'avg'  (only for binaural rendering)\n" );

#endif

    fprintf( stdout, "-render_config file : Renderer configuration file\n" );

    fprintf( stdout, "-no_diegetic_pan    : panning mono no dietic sound to stereo -1<= pan <=1,\n" );

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -236,7 +236,11 @@ static const CmdLnParser_Option cliOptions[] = { 
        .id = CmdLnOptionId_orientationTracking,

        .match = "tracking_type",

        .matchShort = "otr",

#ifdef FIX_I109_ORIENTATION_TRACKING

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

#else

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

#endif

    },

    {

        .id = CmdlnOptionId_lfePosition,