--- a/.hgignore	Thu Dec 15 19:21:45 2022 +0000
+++ b/.hgignore	Thu Dec 15 23:47:12 2022 +0000
@@ -16,6 +16,7 @@
 ^efrtest/gsmefr-decode$
 ^efrtest/gsmefr-decode-r$
 ^efrtest/gsmefr-dlcap-gsmx$
+^efrtest/gsmefr-dlcap-parse$
 ^efrtest/gsmefr-encode$
 ^efrtest/gsmefr-encode-r$
 ^efrtest/gsmefr-etsi-dec$

--- a/efrtest/Makefile	Thu Dec 15 19:21:45 2022 +0000
+++ b/efrtest/Makefile	Thu Dec 15 23:47:12 2022 +0000
@@ -1,8 +1,8 @@
 CC=	gcc
 CFLAGS=	-O2
 PROGS=	gsmefr-cod-parse gsmefr-dec-parse gsmefr-decode gsmefr-decode-r \
-	gsmefr-dlcap-gsmx gsmefr-encode gsmefr-encode-r gsmefr-etsi-dec \
-	gsmefr-etsi-enc gsmefr-rec2etsi
+	gsmefr-dlcap-gsmx gsmefr-dlcap-parse gsmefr-encode gsmefr-encode-r \
+	gsmefr-etsi-dec gsmefr-etsi-enc gsmefr-rec2etsi
 LIBEFR=	../libgsmefr/libgsmefr.a
 LIBTEST=../libtest/libtest.a
 INSTBIN=/opt/freecalypso/bin
@@ -24,6 +24,9 @@
 gsmefr-dlcap-gsmx:	dlcap-gsmx.o tidsp.o ${LIBTEST}
 	${CC} ${CFLAGS} -o $@ dlcap-gsmx.o tidsp.o ${LIBTEST}
 
+gsmefr-dlcap-parse:	dlcap-parse.o tidsp.o ${LIBTEST} ${LIBEFR}
+	${CC} ${CFLAGS} -o $@ dlcap-parse.o tidsp.o ${LIBTEST} ${LIBEFR}
+
 gsmefr-encode:	encode.o ${LIBTEST} ${LIBEFR}
 	${CC} ${CFLAGS} -o $@ encode.o ${LIBTEST} ${LIBEFR}
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/efrtest/dlcap-parse.c	Thu Dec 15 23:47:12 2022 +0000
@@ -0,0 +1,98 @@
+/*
+ * This program reads a TCH/EFS downlink capture produced with FreeCalypso tools
+ * (fw version with TCH downlink sniffing feature and fc-shell tch record),
+ * parses the frame bits according to our current understanding, and dumps
+ * everything in human-readable form for further analysis.
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include "../libgsmefr/gsm_efr.h"
+
+static void
+process_record(lineno, fn_mod_104, status_words, tidsp_bytes)
+	int lineno;
+	unsigned fn_mod_104;
+	uint16_t *status_words;
+	uint8_t *tidsp_bytes;
+{
+	uint8_t efr_bytes[EFR_RTP_FRAME_LEN];
+	int16_t params[EFR_NUM_PARAMS];
+	int i, j, n;
+
+	printf("#%d: fn=%u DSP %04X %04X %04X\n", lineno, fn_mod_104,
+		status_words[0], status_words[1], status_words[2]);
+	efr_tidsp_to_std(tidsp_bytes, efr_bytes);
+	fputs("  bits ", stdout);
+	for (i = 0; i < 33; i++)
+		printf("%02X", tidsp_bytes[i]);
+	printf(" SID=%d\n", EFR_sid_classify(efr_bytes));
+	printf("  rept-bits %u %u %u %u\n", (tidsp_bytes[23] & 0x38) >> 3,
+		tidsp_bytes[23] & 7, (tidsp_bytes[24] & 0xE0) >> 5,
+		(tidsp_bytes[24] & 0x1C) >> 2);
+	EFR_frame2params(efr_bytes, params);
+	fputs("  LPC", stdout);
+	n = 0;
+	for (i = 0; i < 5; i++)
+		printf(" %d", params[n++]);
+	putchar('\n');
+	for (i = 0; i < 4; i++) {
+		putchar(' ');
+		for (j = 0; j < 13; j++)
+			printf(" %d", params[n++]);
+		putchar('\n');
+	}
+}
+
+main(argc, argv)
+	char **argv;
+{
+	FILE *inf;
+	char linebuf[128];
+	int lineno, rc;
+	uint16_t status_words[3];
+	uint8_t tidsp_bytes[33];
+	unsigned fn_mod_104;
+
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s dlcap-file\n", argv[0]);
+		exit(1);
+	}
+	inf = fopen(argv[1], "r");
+	if (!inf) {
+		perror(argv[1]);
+		exit(1);
+	}
+	for (lineno = 1; fgets(linebuf, sizeof linebuf, inf); lineno++) {
+		/* support both old and new formats */
+		if (isxdigit(linebuf[0]) && isxdigit(linebuf[1]) &&
+		    isxdigit(linebuf[2]) && isxdigit(linebuf[3])) {
+			rc = parse_dlcap_common(linebuf, status_words,
+						tidsp_bytes);
+			if (rc < 0) {
+invalid:			fprintf(stderr,
+				"error: %s is not in the expected format\n",
+					argv[1]);
+				exit(1);
+			}
+			fn_mod_104 = 0;		/* won't have TAF */
+		} else if (!strncmp(linebuf, "EFR ", 4)) {
+			rc = parse_dlcap_common(linebuf + 4, status_words,
+						tidsp_bytes);
+			if (rc < 0)
+				goto invalid;
+			if (linebuf[85] != ' ')
+				goto invalid;
+			if (!isdigit(linebuf[86]))
+				goto invalid;
+			fn_mod_104 = strtoul(linebuf + 86, 0, 10);
+		} else
+			goto invalid;
+		process_record(lineno, fn_mod_104, status_words, tidsp_bytes);
+	}
+	exit(0);
+}