From 4cf4989cc683313d8c26b2d3ece61de0195defbb Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 8 Nov 2022 14:48:26 +0100 Subject: [PATCH] Revert "main.cpp: even if not sending use non-zero ports" This reverts commit c25a362c70f2b64a38bc8254cae7411fe83d0c2b. --- src/main.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 50f3695bb..7b92a4078 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1296,7 +1296,11 @@ static int adjust_params(struct ug_options *opt) { } if (opt->video_tx_port == -1) { - opt->video_tx_port = opt->port_base; + if ((opt->video_rxtx_mode & MODE_SENDER) == 0U) { + opt->video_tx_port = 0; // does not matter, we are receiver + } else { + opt->video_tx_port = opt->port_base; + } } if (opt->audio.recv_port == -1) { @@ -1310,7 +1314,11 @@ static int adjust_params(struct ug_options *opt) { } if (opt->audio.send_port == -1) { - opt->audio.send_port = opt->video_tx_port ? opt->video_tx_port + 2 : opt->port_base + 2; + if ((audio_rxtx_mode & MODE_SENDER) == 0U) { + opt->audio.send_port = 0; + } else { + opt->audio.send_port = opt->video_tx_port ? opt->video_tx_port + 2 : opt->port_base + 2; + } } // If we are sure that this UltraGrid is sending to itself we can optimize some parameters