--- a/.hgignore	Sat Sep 21 23:31:25 2024 +0000
+++ b/.hgignore	Sat Sep 21 23:58:27 2024 +0000
@@ -66,6 +66,7 @@
 ^frtest/gsmfr-decode-r$
 ^frtest/gsmfr-decode-rb$
 ^frtest/gsmfr-decode-tw5$
+^frtest/gsmfr-decode-tw5-r$
 ^frtest/gsmfr-dlcap-gsmx$
 ^frtest/gsmfr-dlcap-parse$
 ^frtest/gsmfr-dlcap-sync$

--- a/frtest/Makefile	Sat Sep 21 23:31:25 2024 +0000
+++ b/frtest/Makefile	Sat Sep 21 23:58:27 2024 +0000
@@ -1,6 +1,6 @@
 PROGS=	gsmfr-cod2std gsmfr-decode gsmfr-decode-r gsmfr-decode-rb \
-	gsmfr-decode-tw5 gsmfr-dlcap-gsmx gsmfr-dlcap-parse gsmfr-dlcap-sync \
-	gsmfr-encode gsmfr-encode-r gsmfr-preproc
+	gsmfr-decode-tw5 gsmfr-decode-tw5-r gsmfr-dlcap-gsmx gsmfr-dlcap-parse \
+	gsmfr-dlcap-sync gsmfr-encode gsmfr-encode-r gsmfr-preproc
 LIBFR2=	../libgsmfr2/libgsmfr2.a
 LIBTEST=../libtest/libtest.a
 
@@ -23,6 +23,9 @@
 gsmfr-decode-tw5:	decode-tw5.o ${LIBTEST} ${LIBFR2}
 	${CC} ${CFLAGS} -o $@ $^
 
+gsmfr-decode-tw5-r:	decode-tw5-r.o ${LIBTEST} ${LIBFR2}
+	${CC} ${CFLAGS} -o $@ $^
+
 gsmfr-dlcap-gsmx:	dlcap-gsmx.o tidsp.o ${LIBTEST}
 	${CC} ${CFLAGS} -o $@ $^
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/frtest/decode-tw5-r.c	Sat Sep 21 23:58:27 2024 +0000
@@ -0,0 +1,66 @@
+/*
+ * This file is the main module for gsmfr-decode-tw5-r utility.  It is just
+ * like the original gsmfr-decode-r, but reads the GSM-FR speech recording
+ * from TW-TS-005 Annex A hexadecimal format instead of the old gsmx
+ * binary format.  The output format is robe, as indicated by the -r suffix.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include "../libgsmfr2/tw_gsmfr.h"
+#include "../libtest/tw5reader.h"
+#include "../libtest/robewrite.h"
+
+main(argc, argv)
+	char **argv;
+{
+	FILE *hexf, *outf;
+	unsigned lineno;
+	struct gsmfr_fulldec_state *fd_state;
+	uint8_t frame[TWTS005_MAX_FRAME];
+	unsigned frame_len;
+	int16_t pcm[160];
+	int rc;
+
+	if (argc != 3) {
+		fprintf(stderr, "usage: %s input.hex output.robe\n", argv[0]);
+		exit(1);
+	}
+	hexf = fopen(argv[1], "r");
+	if (!hexf) {
+		perror(argv[1]);
+		exit(1);
+	}
+	lineno = 0;
+	outf = fopen(argv[2], "w");
+	if (!outf) {
+		perror(argv[2]);
+		exit(1);
+	}
+	fd_state = gsmfr_fulldec_create();
+	if (!fd_state) {
+		fprintf(stderr, "gsmfr_fulldec_create() failed!\n");
+		exit(1);
+	}
+	for (;;) {
+		rc = twts005_read_frame(hexf, &lineno, frame, &frame_len);
+		if (rc < 0) {
+			fprintf(stderr, "%s line %u: not valid TW-TS-005\n",
+				argv[1], lineno);
+			exit(1);
+		}
+		if (!rc)
+			break;
+		rc = gsmfr_fulldec_rtp_in(fd_state, frame, frame_len, pcm);
+		if (rc < 0) {
+			fprintf(stderr,
+				"%s line %u: not a valid GSM-FR frame\n",
+				argv[1], lineno);
+			exit(1);
+		}
+		write_pcm_to_robe(outf, pcm);
+	}
+	fclose(outf);
+	exit(0);
+}