Commit 2c4a7ff9 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1314-basop-port-mr1273' into 'main-pc'

Port MR 1273 from float repo to BASOP.

See merge request !1157
parents e93e1892 5d95b7bf
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -323,7 +323,11 @@ 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_929_RENDERER_CMDL
        .match = "no_delay_compensation",
#else
        .match = "no_delay_comparison",
#endif
        .matchShort = "no_delay_cmp",
        .description = "[flag] Turn off delay compensation",
    },
+2 −0
Original line number Diff line number Diff line
@@ -184,7 +184,9 @@
#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */
#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */
#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */
#define FIX_929_RENDERER_CMDL                   /* Nokia: issue #929: renderer command line option */

/* #################### End BASOP porting switches ############################ */


#endif