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

pbuf: fixed dropped frm after TS wrap-around

Browse Source 
timestamp wraparound was not properly handled

Until 3480fc647 (2023-06-28) this occured just after 13 hrs (2^32 overflow
with 90 kHz clock) because the timestamp initial random offset was taken
from uninitilaized random generator. Since this change, this can can
occur randomly every those 13 hrs.
This commit is contained in:
Martin Pulec
2023-07-12 14:49:06 +02:00
parent c859f7b44c
commit 181b79f68d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rtp/pbuf.c
View File

@@ -70,8 +70,11 @@
#define PBUF_MAGIC 0xcafebabe
#define DEFAULT_STATS_INTERVAL 128
#define STAT_INT_MIN_DIVISOR (sizeof(unsigned long long) * CHAR_BIT)
enum {
DEFAULT_STATS_INTERVAL = 128,
STAT_INT_MIN_DIVISOR = sizeof(unsigned long long) * CHAR_BIT,
WRAPAROUND_THRESHOLD = 900000, // 10 sec with 90 kHz clock
};
static_assert(DEFAULT_STATS_INTERVAL % STAT_INT_MIN_DIVISOR == 0,
"STATS_INTERVAL must be divisible by (sizeof(ull) * CHAR_BIT)");
#define MOD_NAME "[Pbuf] "
@@ -423,7 +426,9 @@ void pbuf_insert(struct pbuf *playout_buf, rtp_packet * pkt)
/* most likely scenario - although... */
add_coded_unit(playout_buf->last, pkt);
} else {
if (playout_buf->last->rtp_timestamp < pkt->ts) {
if (playout_buf->last->rtp_timestamp < pkt->ts ||
playout_buf->last->rtp_timestamp - pkt->ts >
UINT32_MAX - WRAPAROUND_THRESHOLD) {
/* Packet belongs to a new frame... */
tmp = create_new_pnode(pkt, playout_buf->playout_delay_us + 1000 * (playout_buf->offset_ms ? *playout_buf->offset_ms : 0));
playout_buf->last->nxt = tmp;
@@ -433,7 +438,9 @@ void pbuf_insert(struct pbuf *playout_buf, rtp_packet * pkt)
} else {
bool discard_pkt = false;
/* Packet belongs to a previous frame... */
if (playout_buf->frst->rtp_timestamp > pkt->ts) {
if (playout_buf->frst->rtp_timestamp > pkt->ts ||
pkt->ts - playout_buf->frst->rtp_timestamp >
UINT32_MAX - WRAPAROUND_THRESHOLD) {
debug_msg("A very old packet - discarded\n");
discard_pkt = true;
} else {