[MERGED] libosmo-abis[master]: Add defines for FN to SAMPLE conversion

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: Add defines for FN to SAMPLE conversion
......................................................................


Add defines for FN to SAMPLE conversion

Add defines necessary to correctly convert number of TDMA frames into
number of voice samples. Defines are proposed by Harald in comments on
gerrit.

Change-Id: I1d8345352fb2ac76f71e88cb40f089fe3f9aae7e
Related: OS#1562
Reviewed-on: https://gerrit.osmocom.org/200
Tested-by: Jenkins Builder
Reviewed-by: Harald Welte <laforge at gnumonks.org>
---
M include/osmocom/trau/osmo_ortp.h
1 file changed, 9 insertions(+), 0 deletions(-)

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



diff --git a/include/osmocom/trau/osmo_ortp.h b/include/osmocom/trau/osmo_ortp.h
index cec0d2e..eb53a41 100644
--- a/include/osmocom/trau/osmo_ortp.h
+++ b/include/osmocom/trau/osmo_ortp.h
@@ -22,6 +22,15 @@
 /*! \brief Osmocom pseudo-static paylaod type for Adaptive Multi Rate (AMR) */
 #define RTP_PT_AMR 98
 
+#define GSM_VOICE_SAMPLE_RATE_HZ 8000
+#define GSM_VOICE_SAMPLES_PER_MS (GSM_VOICE_SAMPLE_RATE_HZ / 1000)
+#define GSM_VOICE_MULTIFRAME 26
+#define GSM_RTP_FRAME_DURATION_MS 20
+#define GSM_SAMPLES_PER_RTP_FRAME (GSM_RTP_FRAME_DURATION_MS * GSM_VOICE_SAMPLES_PER_MS)
+#define GSM_TDMA_FRAME_MS (120 / GSM_VOICE_MULTIFRAME)
+#define GSM_MS_TO_SAMPLES(ms) (ms * GSM_VOICE_SAMPLES_PER_MS)
+#define GSM_FN_TO_MS(fn) (fn * GSM_TDMA_FRAME_MS)
+
 /*! \brief Parameter to osmo_rtp_socket_param_set() */
 enum osmo_rtp_param {
 	OSMO_RTP_P_JITBUF = 1,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1d8345352fb2ac76f71e88cb40f089fe3f9aae7e
Gerrit-PatchSet: 2
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder