--- a/.hgignore	Fri Oct 04 20:17:36 2024 +0000
+++ b/.hgignore	Fri Oct 04 20:40:42 2024 +0000
@@ -52,6 +52,7 @@
 ^efrtest/gsmefr-decode$
 ^efrtest/gsmefr-decode-r$
 ^efrtest/gsmefr-decode-tw5$
+^efrtest/gsmefr-decode-tw5-r$
 ^efrtest/gsmefr-dlcap-dec$
 ^efrtest/gsmefr-dlcap-gsmx$
 ^efrtest/gsmefr-dlcap-parse$

--- a/efrtest/Makefile	Fri Oct 04 20:17:36 2024 +0000
+++ b/efrtest/Makefile	Fri Oct 04 20:40:42 2024 +0000
@@ -1,7 +1,7 @@
 PROGS=	gsmefr-cod-parse gsmefr-cod2gsmx gsmefr-dec-parse gsmefr-decode \
-	gsmefr-decode-r gsmefr-decode-tw5 gsmefr-dlcap-dec gsmefr-dlcap-gsmx \
-	gsmefr-dlcap-parse gsmefr-dlcap-sync gsmefr-encode gsmefr-encode-r \
-	gsmefr-etsi-dec gsmefr-etsi-enc gsmefr-rec2etsi
+	gsmefr-decode-r gsmefr-decode-tw5 gsmefr-decode-tw5-r gsmefr-dlcap-dec \
+	gsmefr-dlcap-gsmx gsmefr-dlcap-parse gsmefr-dlcap-sync gsmefr-encode \
+	gsmefr-encode-r gsmefr-etsi-dec gsmefr-etsi-enc gsmefr-rec2etsi
 LIBEFR=	../libgsmefr/libgsmefr.a
 LIBTEST=../libtest/libtest.a
 
@@ -27,6 +27,9 @@
 gsmefr-decode-tw5:	decode-tw5.o ${LIBTEST} ${LIBEFR}
 	${CC} ${CFLAGS} -o $@ $^
 
+gsmefr-decode-tw5-r:	decode-tw5-r.o ${LIBTEST} ${LIBEFR}
+	${CC} ${CFLAGS} -o $@ $^
+
 gsmefr-dlcap-dec:	dlcap-dec.o tidsp.o ${LIBTEST} ${LIBEFR}
 	${CC} ${CFLAGS} -o $@ $^
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/efrtest/decode-tw5-r.c	Fri Oct 04 20:40:42 2024 +0000
@@ -0,0 +1,66 @@
+/*
+ * This file is the main module for gsmefr-decode-tw5-r utility.  It is just
+ * like the original gsmefr-decode-r, but reads the GSM-EFR 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 "../libgsmefr/gsm_efr.h"
+#include "../libtest/tw5reader.h"
+#include "../libtest/robewrite.h"
+
+main(argc, argv)
+	char **argv;
+{
+	FILE *hexf, *outf;
+	unsigned lineno;
+	struct EFR_decoder_state *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);
+	}
+	state = EFR_decoder_create();
+	if (!state) {
+		perror("EFR_decoder_create()");
+		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 = EFR_decode_rtp(state, frame, frame_len, pcm);
+		if (rc < 0) {
+			fprintf(stderr,
+				"%s line %u: not a valid GSM-EFR frame\n",
+				argv[1], lineno);
+			exit(1);
+		}
+		write_pcm_to_robe(outf, pcm);
+	}
+	fclose(outf);
+	exit(0);
+}