scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 20:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

transmit video multipliers: simplified pattern

Browse Source 
Simply send multiplied packets sequentially, like for mult:3:

0 0 0 1 1 1 2 2 2 ....

This simplifies the code while the old one was already defunct (at least
the access to packet sizes' list was wrong since recent rewrite).
This commit is contained in:
Martin Pulec
2022-03-07 15:20:30 +01:00
parent eb9b00b6e9
commit 6d5cbde4fa
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/transmit.cpp
View File

@@ -550,7 +550,6 @@ tx_send_base(struct tx *tx, struct video_frame *frame, struct rtp *rtp_session,
uint32_t tmp;
array <int, FEC_MAX_MULT> mult_pos{};
int mult_index = 0;
int mult_first_sent = 0;
int hdrs_len = (rtp_is_ipv6(rtp_session) ? 40 : 20) + 8 + 12; // IP hdr size + UDP hdr size + RTP hdr size
unsigned int fec_symbol_size = frame->fec_params.symbol_size;
@@ -693,15 +692,9 @@ tx_send_base(struct tx *tx, struct video_frame *frame, struct rtp *rtp_session,
if(tx->fec_scheme == FEC_MULT) {
mult_pos[mult_index] = pos;
mult_first_sent ++;
if(mult_index != 0 || mult_first_sent >= (tx->mult_count - 1))
mult_index = (mult_index + 1) % tx->mult_count;
mult_index = (mult_index + 1) % tx->mult_count;
}
/* when trippling, we need all streams goes to end */
if(tx->fec_scheme == FEC_MULT) {
pos = mult_pos[tx->mult_count - 1];
}
rtp_hdr_packet += rtp_hdr_len / sizeof(uint32_t);
// TRAFFIC SHAPER
@@ -713,7 +706,7 @@ tx_send_base(struct tx *tx, struct video_frame *frame, struct rtp *rtp_session,
overslept = -(packet_rate - delta - overslept);
//fprintf(stdout, "%ld ", overslept);
}
} while (pos < (unsigned int) tile->data_len);
} while (pos < (unsigned int) tile->data_len || mult_index != 0); // when multiplying, we need all streams go to the end
if (!tx->encryption) {
rtp_async_wait(rtp_session);