osmocom
/
gapk
mirror of https://gerrit.osmocom.org/gapk
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

format/fmt_ti: Add support for HR variant 

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2011-02-25 16:58:36 +01:00
parent cfaec3a2f6
commit b1525d67fe
3 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/gapk/formats.h
View File

@ -44,6 +44,7 @@ enum format_type {
FMT_RAWPCM_S16LE,
/* Texas Instrument calypso/locosto buffer format */
FMT_TI_HR,
FMT_TI_FR,
_FMT_MAX,

56
src/fmt_ti.c
View File

@ -34,6 +34,62 @@
#include <gapk/utils.h>
static int
ti_hr_from_canon(uint8_t *dst, const uint8_t *src)
{
int i, voiced;
const uint16_t *bit_mapping;
memset(dst, 0x00, 33); /* Not even half the bits are written, so we pre-clear */
voiced = (msb_get_bit(src, 34) << 1) | msb_get_bit(src, 35);
bit_mapping = voiced ?
&gsm620_voiced_bitorder[0] :
&gsm620_unvoiced_bitorder[0] ;
for (i=0; i<112; i++) {
int si = bit_mapping[i];
int di = i >= 95 ? i+4 : i;
lsb_put_bit(dst, di, msb_get_bit(src, si));
}
return 0;
}
static int
ti_hr_to_canon(uint8_t *dst, const uint8_t *src)
{
int i, voiced;
const uint16_t *bit_mapping;
voiced = (msb_get_bit(src, 94) << 1) | msb_get_bit(src, 93);
bit_mapping = voiced ?
&gsm620_voiced_bitorder[0] :
&gsm620_unvoiced_bitorder[0] ;
for (i=0; i<112; i++) {
int si = i >= 95 ? i+4 : i;
int di = bit_mapping[i];
msb_put_bit(dst, di, msb_get_bit(src, si));
}
return 0;
}
const struct format_desc fmt_ti_hr = {
.type = FMT_TI_HR,
.codec_type = CODEC_HR,
.name = "ti-hr",
.description = "Texas Instrument HR TCH/H buffer format",
.frame_len = 33,
.conv_from_canon = ti_hr_from_canon,
.conv_to_canon = ti_hr_to_canon,
};
static int
ti_fr_from_canon(uint8_t *dst, const uint8_t *src)
{

2
src/formats.c
View File

@ -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_hr;
extern const struct format_desc fmt_ti_fr;
static const struct format_desc *supported_formats[_FMT_MAX] = {
@ -43,6 +44,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_HR] = &fmt_ti_hr,
[FMT_TI_FR] = &fmt_ti_fr,
};