summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2011-02-25 15:31:54 +0100
committerSylvain Munaut <tnt@246tNt.com>2011-02-25 15:31:54 +0100
commitcfaec3a2f6590bafcaecbc580eba798988a9a2fa (patch)
treed59ee2946c09486dd6677e394947ef3a702229f4
parent3c9c2fb6eeb04dc6f6e4da43aebe9ac920f1e8f3 (diff)
format: Add support for the TI calypso/locosto dumped buffer format
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--include/gapk/formats.h3
-rw-r--r--src/Makefile.am2
-rw-r--r--src/fmt_ti.c78
-rw-r--r--src/formats.c2
4 files changed, 84 insertions, 1 deletions
diff --git a/include/gapk/formats.h b/include/gapk/formats.h
index d95dabc..5233550 100644
--- a/include/gapk/formats.h
+++ b/include/gapk/formats.h
@@ -43,6 +43,9 @@ enum format_type {
/* Raw PCM */
FMT_RAWPCM_S16LE,
+ /* Texas Instrument calypso/locosto buffer format */
+ FMT_TI_FR,
+
_FMT_MAX,
};
diff --git a/src/Makefile.am b/src/Makefile.am
index f7a5b44..55a6a5d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = gapk
gapk_SOURCES = main.c \
procqueue.c pq_file.c pq_format.c pq_codec.c \
formats.c fmt_amr.c fmt_gsm.c fmt_hr_ref.c fmt_racal.c \
- fmt_rawpcm.c \
+ fmt_rawpcm.c fmt_ti.c \
codecs.c codec_pcm.c codec_hr.c codec_fr.c codec_efr.c
if ENABLE_GSMHR
diff --git a/src/fmt_ti.c b/src/fmt_ti.c
new file mode 100644
index 0000000..862d694
--- /dev/null
+++ b/src/fmt_ti.c
@@ -0,0 +1,78 @@
+/* TI Calypso / Locosto (?) internal buffer format */
+
+/* The buffer are actually 16 bits words and must be read as
+ * such in the HW itself.
+ * It's assumed here it was dumped by putting the 8 MSB first
+ * and 8 LSB in the dumped files, for 33 bytes (thus dropping the
+ * last 8 LSBs)
+ */
+
+/*
+ * This file is part of gapk (GSM Audio Pocket Knife).
+ *
+ * gapk is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * gapk is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gapk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include <osmocom/codec/codec.h>
+
+#include <gapk/codecs.h>
+#include <gapk/formats.h>
+#include <gapk/utils.h>
+
+
+static int
+ti_fr_from_canon(uint8_t *dst, const uint8_t *src)
+{
+ int i;
+
+ dst[22] = dst[23] = 0x00; /* some bits won't be writter, pre-clear them */
+
+ for (i=0; i<260; i++) {
+ int si = gsm610_bitorder[i];
+ int di = i >= 182 ? i+4 : i;
+ msb_put_bit(dst, di, msb_get_bit(src, si));
+ }
+
+ return 0;
+}
+
+static int
+ti_fr_to_canon(uint8_t *dst, const uint8_t *src)
+{
+ int i;
+
+ dst[32] = 0x00; /* last nibble won't written, pre-clear it */
+
+ for (i=0; i<260; i++) {
+ int si = i >= 182 ? i+4 : i;
+ int di = gsm610_bitorder[i];
+ msb_put_bit(dst, di, msb_get_bit(src, si));
+ }
+
+ return 0;
+}
+
+const struct format_desc fmt_ti_fr = {
+ .type = FMT_TI_FR,
+ .codec_type = CODEC_FR,
+ .name = "ti-fr",
+ .description = "Texas Instrument FR TCH/F buffer format",
+
+ .frame_len = 33,
+ .conv_from_canon = ti_fr_from_canon,
+ .conv_to_canon = ti_fr_to_canon,
+};
diff --git a/src/formats.c b/src/formats.c
index 9e5d07b..997ea05 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -31,6 +31,7 @@ extern const struct format_desc fmt_racal_hr;
extern const struct format_desc fmt_racal_fr;
extern const struct format_desc fmt_racal_efr;
extern const struct format_desc fmt_rawpcm_s16le;
+extern const struct format_desc fmt_ti_fr;
static const struct format_desc *supported_formats[_FMT_MAX] = {
[FMT_INVALID] = NULL,
@@ -42,6 +43,7 @@ static const struct format_desc *supported_formats[_FMT_MAX] = {
[FMT_RACAL_FR] = &fmt_racal_fr,
[FMT_RACAL_EFR] = &fmt_racal_efr,
[FMT_RAWPCM_S16LE] = &fmt_rawpcm_s16le,
+ [FMT_TI_FR] = &fmt_ti_fr,
};