From: Maximilian Fridrich <m.fridrich@commend.com>
Date: Fri, 28 Feb 2025 07:43:44 +0000 (+0100)
Subject: Revert "res_rtp_asterisk.c: Set Mark on rtp when timestamp skew is too big"
X-Git-Tag: 21.8.0-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ad349b10fef20666bd87df62c32ec7e8b9b7d07;p=thirdparty%2Fasterisk.git

Revert "res_rtp_asterisk.c: Set Mark on rtp when timestamp skew is too big"

This reverts commit f30ad96b3f467739c38ff415e80bffc4afff1da7.

The original change was not RFC compliant and caused issues because it
set the RTP marker bit in cases when it shouldn't be set. See the
linked issue #1135 for a detailed explanation.

Fixes: #1135.
(cherry picked from commit a47fe8f84f89a3e2fdf125002c090034dccb5d59)
---

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index d8b0a0cc4d..df9c012fac 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -5266,11 +5266,6 @@ static int rtp_raw_write(struct ast_rtp_instance *instance, struct ast_frame *fr
 	}
 
 	if (ast_test_flag(frame, AST_FRFLAG_HAS_TIMING_INFO)) {
-		if (abs(frame->ts * rate - (int)rtp->lastts) > MAX_TIMESTAMP_SKEW) {
-			ast_verbose("(%p) RTP audio difference is %d set mark\n",
-				instance, abs(frame->ts * rate - (int)rtp->lastts));
-			mark = 1;
-		}
 		rtp->lastts = frame->ts * rate;
 	}