Commit 86a8ccd6 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_247_EXTERNAL_RENDERER_COMMAND_LINE

parent 34e5db39

apps/renderer.c

+0 −20
Original line number Diff line number Diff line
@@ -277,11 +277,7 @@ static const CmdLnParser_Option cliOptions[] = { 
    {

        .id = CmdLnOptionId_trajFile,

        .match = "trajectory_file",

#ifdef FIX_247_EXTERNAL_RENDERER_COMMAND_LINE

        .matchShort = "T",

#else

        .matchShort = "tf",

#endif

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

    },

#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -312,25 +308,14 @@ static const CmdLnParser_Option cliOptions[] = { 
    },

    {

        .id = CmdLnOptionId_renderConfigFile,

#ifdef FIX_247_EXTERNAL_RENDERER_COMMAND_LINE

        .match = "render_config_parameters",

        .matchShort = "render_config",

        .description = "Binaural renderer configuration parameters in file (only for binaural outputs)",

#else

        .match = "render_config",

        .matchShort = "rc",

        .description = "Binaural renderer configuration file (only for binaural outputs)",

#endif

    },

    {

        .id = CmdLnOptionId_nonDiegeticPan,

#ifdef FIX_247_EXTERNAL_RENDERER_COMMAND_LINE

        .match = "non_diegetic_panning",

        .matchShort = "non_diegetic_pan",

#else

        .match = "non_diegetic_pan",

        .matchShort = "ndp",

#endif

        .description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right, center or c or 0 ->middle\n",

    },

    {
@@ -351,13 +336,8 @@ static const CmdLnParser_Option cliOptions[] = { 
      .description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" },

    {

        .id = CmdLnOptionId_noDelayCmp,

#ifdef FIX_247_EXTERNAL_RENDERER_COMMAND_LINE

        .match = "no_delay_comparison",

        .matchShort = "no_delay_cmp",

#else

        .match = "no_delay_cmp",

        .matchShort = "ndc",

#endif

        .description = "[flag] Turn off delay compensation",

    },

    {

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_247_EXTERNAL_RENDERER_COMMAND_LINE          /* VA: issue 247: harmonize command-line options names of external renderer with the decoder */

#define FIX_643_PCA_OPTION                              /* VA: issue 643: rename PCA bypass command-line option */



/* #################### End BE switches ################################## */