diff dev/gsm0611-silence-fr.c @ 276:e4ca04586118

dev/gsm0611-silence-fr: rework to eliminate libgsm dependency
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 14 Apr 2024 03:38:09 +0000
parents 61cb83bd11ec
children
line wrap: on
line diff
--- a/dev/gsm0611-silence-fr.c	Sun Apr 14 03:06:03 2024 +0000
+++ b/dev/gsm0611-silence-fr.c	Sun Apr 14 03:38:09 2024 +0000
@@ -3,40 +3,39 @@
  * libgsm function gsm_implode() to transform the idle frame of GSM 06.11
  * (3GPP TS 46.011) from the table format given in the spec into
  * libgsm/RTP format.
+ *
+ * Later update: this program has been reworked to use the local function
+ * in pack_gsmfr_rtp.c instead of gsm_implode(), in order to eliminate
+ * all build dependencies on old libgsm.
  */
 
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <gsm.h>
+
+extern void gsmfr_pack_to_rtp(const int16_t *params, uint8_t *frame);
 
-static const gsm_signal lar_params[8] = {42, 39, 21, 10, 9, 4, 3, 2};
-static const gsm_signal subframe_params[17] =
+static const int16_t lar_params[8] = {42, 39, 21, 10, 9, 4, 3, 2};
+static const int16_t subframe_params[17] =
 	{40, 0, 1, 0,  3, 4, 3, 4, 4,  3, 3, 3, 3, 4, 4, 3, 3};
 
 main(argc, argv)
 	char **argv;
 {
-	gsm state;
-	gsm_signal params[76];
-	gsm_byte frame[33];
+	int16_t params[76];
+	uint8_t frame[33];
 	unsigned n;
 
-	/* gsm_implode() requires dummy state */
-	state = gsm_create();
-	if (!state) {
-		fprintf(stderr, "gsm_create() failed!\n");
-		exit(1);
-	}
 	/* gather params */
-	bcopy(lar_params, params, sizeof(gsm_signal) * 8);
-	bcopy(subframe_params, params + 8, sizeof(gsm_signal) * 17);
-	bcopy(subframe_params, params + 25, sizeof(gsm_signal) * 17);
-	bcopy(subframe_params, params + 42, sizeof(gsm_signal) * 17);
-	bcopy(subframe_params, params + 59, sizeof(gsm_signal) * 17);
+	bcopy(lar_params, params, sizeof(int16_t) * 8);
+	bcopy(subframe_params, params + 8, sizeof(int16_t) * 17);
+	bcopy(subframe_params, params + 25, sizeof(int16_t) * 17);
+	bcopy(subframe_params, params + 42, sizeof(int16_t) * 17);
+	bcopy(subframe_params, params + 59, sizeof(int16_t) * 17);
 	/* generate frame */
-	gsm_implode(state, params, frame);
+	gsmfr_pack_to_rtp(params, frame);
 	/* print the frame */
 	for (n = 0; n < 33; n++) {
 		printf("0x%02X,", frame[n]);