diff options
-rw-r--r-- | include/gapk/formats.h | 3 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/fmt_gsm.c | 59 | ||||
-rw-r--r-- | src/formats.c | 3 |
4 files changed, 66 insertions, 1 deletions
diff --git a/include/gapk/formats.h b/include/gapk/formats.h index d98baca..19d60b8 100644 --- a/include/gapk/formats.h +++ b/include/gapk/formats.h @@ -25,6 +25,9 @@ enum format_type { FMT_INVALID = 0, + /* Classic .gsm file for FR */ + FMT_GSM, + _FMT_MAX, }; diff --git a/src/Makefile.am b/src/Makefile.am index c77be9e..4a6689e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,5 +4,5 @@ AM_LDFLAGS=$(LIBOSMOCODEC_LIBS) bin_PROGRAMS = gapk gapk_SOURCES = main.c \ - formats.c \ + formats.c fmt_gsm.c \ codecs.c codec_pcm.c codec_hr.c codec_fr.c codec_efr.c diff --git a/src/fmt_gsm.c b/src/fmt_gsm.c new file mode 100644 index 0000000..04ca062 --- /dev/null +++ b/src/fmt_gsm.c @@ -0,0 +1,59 @@ +/* Classic .gsm files for FR */ + +/* + * 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 <gapk/codecs.h> +#include <gapk/formats.h> + + +#define GSM_MAGIC 0xd + +static int +gsm_from_canon(uint8_t *dst, const uint8_t *src) +{ + int i; + + dst[0] = (GSM_MAGIC << 4) | (src[0] >> 4); + for (i=1; i<33; i++) + dst[i] = (src[i-1] << 4) | (src[i] >> 4); + + return 0; +} + +static int +gsm_to_canon(uint8_t *dst, const uint8_t *src) +{ + int i; + + for (i=0; i<32; i++) + dst[i] = (src[i] << 4) | (src[i+1] >> 4); + dst[32] = src[32] << 4; + + return 0; +} + +const struct format_desc fmt_gsm = { + .type = FMT_GSM, + .codec_type = CODEC_FR, + .name = "gsm", + .description = "Classic .gsm file format", + + .frame_len = 33, + .conv_from_canon = gsm_from_canon, + .conv_to_canon = gsm_to_canon, +}; diff --git a/src/formats.c b/src/formats.c index 1f54c05..5c91a52 100644 --- a/src/formats.c +++ b/src/formats.c @@ -22,8 +22,11 @@ #include <gapk/formats.h> /* Extern format descriptors */ +extern const struct format_desc fmt_gsm; + static const struct format_desc *supported_formats[_FMT_MAX] = { [FMT_INVALID] = NULL, + [FMT_GSM] = &fmt_gsm, }; |