[MERGED] libosmo-abis[master]: osmo_ortp.c: Duration of a RTP frame affects timestamp of th...

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: osmo_ortp.c: Duration of a RTP frame affects timestamp of the next one
......................................................................


osmo_ortp.c: Duration of a RTP frame affects timestamp of the next one

Duration of an RTP frames dictates the timestamp used for the next
frame, not for the one being sent now. It was done like this before to
account for possible losses.
Implementation wise, the duration was understood as "duration
between last frame was sent and now when current one is sent". It makes
more sense to use it as the duration in number of sampling ticks
as described on the function documentation, specially now that we can
account for extra time by means of osmo_rtp_skipped_frame.

Change-Id: Ib8f5fa5509059fe908c09a4381844c613d478548
---
M src/trau/osmo_ortp.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c
index c9480ff..c49a23d 100644
--- a/src/trau/osmo_ortp.c
+++ b/src/trau/osmo_ortp.c
@@ -496,9 +496,9 @@
 		return -ENOMEM;
 
 	rtp_set_markbit(mblk, marker);
-	rs->tx_timestamp += duration;
 	rc = rtp_session_sendm_with_ts(rs->sess, mblk,
 				       rs->tx_timestamp);
+	rs->tx_timestamp += duration;
 	if (rc < 0) {
 		/* no need to free() the mblk, as rtp_session_rtp_send()
 		 * unconditionally free()s the mblk even in case of

-- 
To view, visit https://gerrit.osmocom.org/3083
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8f5fa5509059fe908c09a4381844c613d478548
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder