FreeCalypso > hg > gsm-codec-lib
annotate amrconv/Makefile @ 581:e2d5cad04cbf
libgsmhr1 RxFE: store CN R0+LPC separately from speech
In the original GSM 06.06 code the ECU for speech mode is entirely
separate from the CN generator, maintaining separate state. (The
main intertie between them is the speech vs CN state variable,
distinguishing between speech and CN BFIs, in addition to the
CN-specific function of distinguishing between initial and update
SIDs.)
In the present RxFE implementation I initially thought that we could
use the same saved_frame buffer for both ECU and CN, overwriting
just the first 4 params (R0 and LPC) when a valid SID comes in.
However, I now realize it was a bad idea: the original code has a
corner case (long sequence of speech-mode BFIs to put the ECU in
state 6, then SID and CN-mode BFIs, then a good speech frame) that
would be broken by that buffer reuse approach. We could eliminate
this corner case by resetting the ECU state when passing through
a CN insertion period, but doing so would needlessly increase
the behavioral diffs between GSM 06.06 and our version.
Solution: use a separate CN-specific buffer for CN R0+LPC parameters,
and match the behavior of GSM 06.06 code in this regard.
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Thu, 13 Feb 2025 10:02:45 +0000 |
parents | cb1d1ea7f2c5 |
children |
rev | line source |
---|---|
216
9d59df9b0e4e
amrconv: new program amr-ietf2cod
Mychaela Falconia <falcon@freecalypso.org>
parents:
215
diff
changeset
|
1 PROGS= amr-cod-parse amr-cod2ietf amr-ietf-parse amr-ietf2cod gsm-amr2efr \ |
9d59df9b0e4e
amrconv: new program amr-ietf2cod
Mychaela Falconia <falcon@freecalypso.org>
parents:
215
diff
changeset
|
2 gsm-efr2amr |
14
69ed7af28473
gsmfr-encode test program written
Mychaela Falconia <falcon@freecalypso.org>
parents:
12
diff
changeset
|
3 LIBTEST=../libtest/libtest.a |
453
19f1aa01ea10
new approach to config & build for ThemWi software
Mychaela Falconia <falcon@freecalypso.org>
parents:
216
diff
changeset
|
4 |
19f1aa01ea10
new approach to config & build for ThemWi software
Mychaela Falconia <falcon@freecalypso.org>
parents:
216
diff
changeset
|
5 include ../config.defs |
12
f88817a233fb
gsmfr-decode test program written
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
6 |
101
d86f866489e9
gsm-amr2efr utility written
Mychaela Falconia <falcon@freecalypso.org>
parents:
46
diff
changeset
|
7 AMR2EFR_OBJS= amr122bits.o bitmanip.o amr2efr.o |
103
0123ca1f1402
gsm-efr2amr utility written
Mychaela Falconia <falcon@freecalypso.org>
parents:
101
diff
changeset
|
8 EFR2AMR_OBJS= amr122bits.o bitmanip.o efr2amr.o |
101
d86f866489e9
gsm-amr2efr utility written
Mychaela Falconia <falcon@freecalypso.org>
parents:
46
diff
changeset
|
9 |
211
78d1a6513393
amrconv: new program amr-cod-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
184
diff
changeset
|
10 COD_PARSE_OBJS= amr_common_tbl.o cod-parse.o cod-read.o param_asm.o param_dump.o |
214
934cf92a1c45
amrconv: new program amr-ietf-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
211
diff
changeset
|
11 IETF_PARSE_OBJS=amr122bits.o amr_bits.o amr_common_tbl.o bitmanip.o \ |
934cf92a1c45
amrconv: new program amr-ietf-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
211
diff
changeset
|
12 ietf-parse.o ietf_common.o if1_unpack.o param_asm.o param_dump.o |
211
78d1a6513393
amrconv: new program amr-cod-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
184
diff
changeset
|
13 |
215
4c4649a5fec3
amrconv: new program amr-cod2ietf
Mychaela Falconia <falcon@freecalypso.org>
parents:
214
diff
changeset
|
14 COD2IETF_OBJS= amr122bits.o amr_bits.o amr_common_tbl.o bitmanip.o cod-read.o \ |
4c4649a5fec3
amrconv: new program amr-cod2ietf
Mychaela Falconia <falcon@freecalypso.org>
parents:
214
diff
changeset
|
15 cod2ietf.o ietf_common.o if1_pack.o |
216
9d59df9b0e4e
amrconv: new program amr-ietf2cod
Mychaela Falconia <falcon@freecalypso.org>
parents:
215
diff
changeset
|
16 IETF2COD_OBJS= amr122bits.o amr_bits.o amr_common_tbl.o bitmanip.o ietf2cod.o \ |
9d59df9b0e4e
amrconv: new program amr-ietf2cod
Mychaela Falconia <falcon@freecalypso.org>
parents:
215
diff
changeset
|
17 ietf_common.o if1_unpack.o |
215
4c4649a5fec3
amrconv: new program amr-cod2ietf
Mychaela Falconia <falcon@freecalypso.org>
parents:
214
diff
changeset
|
18 |
12
f88817a233fb
gsmfr-decode test program written
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
19 all: ${PROGS} |
f88817a233fb
gsmfr-decode test program written
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
20 |
211
78d1a6513393
amrconv: new program amr-cod-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
184
diff
changeset
|
21 amr-cod-parse: ${COD_PARSE_OBJS} |
78d1a6513393
amrconv: new program amr-cod-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
184
diff
changeset
|
22 ${CC} ${CFLAGS} -o $@ ${COD_PARSE_OBJS} |
78d1a6513393
amrconv: new program amr-cod-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
184
diff
changeset
|
23 |
215
4c4649a5fec3
amrconv: new program amr-cod2ietf
Mychaela Falconia <falcon@freecalypso.org>
parents:
214
diff
changeset
|
24 amr-cod2ietf: ${COD2IETF_OBJS} |
4c4649a5fec3
amrconv: new program amr-cod2ietf
Mychaela Falconia <falcon@freecalypso.org>
parents:
214
diff
changeset
|
25 ${CC} ${CFLAGS} -o $@ ${COD2IETF_OBJS} |
4c4649a5fec3
amrconv: new program amr-cod2ietf
Mychaela Falconia <falcon@freecalypso.org>
parents:
214
diff
changeset
|
26 |
214
934cf92a1c45
amrconv: new program amr-ietf-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
211
diff
changeset
|
27 amr-ietf-parse: ${IETF_PARSE_OBJS} |
934cf92a1c45
amrconv: new program amr-ietf-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
211
diff
changeset
|
28 ${CC} ${CFLAGS} -o $@ ${IETF_PARSE_OBJS} |
934cf92a1c45
amrconv: new program amr-ietf-parse
Mychaela Falconia <falcon@freecalypso.org>
parents:
211
diff
changeset
|
29 |
216
9d59df9b0e4e
amrconv: new program amr-ietf2cod
Mychaela Falconia <falcon@freecalypso.org>
parents:
215
diff
changeset
|
30 amr-ietf2cod: ${IETF2COD_OBJS} |
9d59df9b0e4e
amrconv: new program amr-ietf2cod
Mychaela Falconia <falcon@freecalypso.org>
parents:
215
diff
changeset
|
31 ${CC} ${CFLAGS} -o $@ ${IETF2COD_OBJS} |
9d59df9b0e4e
amrconv: new program amr-ietf2cod
Mychaela Falconia <falcon@freecalypso.org>
parents:
215
diff
changeset
|
32 |
101
d86f866489e9
gsm-amr2efr utility written
Mychaela Falconia <falcon@freecalypso.org>
parents:
46
diff
changeset
|
33 gsm-amr2efr: ${AMR2EFR_OBJS} |
d86f866489e9
gsm-amr2efr utility written
Mychaela Falconia <falcon@freecalypso.org>
parents:
46
diff
changeset
|
34 ${CC} ${CFLAGS} -o $@ ${AMR2EFR_OBJS} |
d86f866489e9
gsm-amr2efr utility written
Mychaela Falconia <falcon@freecalypso.org>
parents:
46
diff
changeset
|
35 |
103
0123ca1f1402
gsm-efr2amr utility written
Mychaela Falconia <falcon@freecalypso.org>
parents:
101
diff
changeset
|
36 gsm-efr2amr: ${EFR2AMR_OBJS} ${LIBTEST} |
0123ca1f1402
gsm-efr2amr utility written
Mychaela Falconia <falcon@freecalypso.org>
parents:
101
diff
changeset
|
37 ${CC} ${CFLAGS} -o $@ ${EFR2AMR_OBJS} ${LIBTEST} |
0123ca1f1402
gsm-efr2amr utility written
Mychaela Falconia <falcon@freecalypso.org>
parents:
101
diff
changeset
|
38 |
17
68a7e86c9868
frtest/Makefile: add install
Mychaela Falconia <falcon@freecalypso.org>
parents:
14
diff
changeset
|
39 install: |
460
cb1d1ea7f2c5
new build system: accept more directory options
Mychaela Falconia <falcon@freecalypso.org>
parents:
453
diff
changeset
|
40 mkdir -p ${DESTDIR}${bindir} |
cb1d1ea7f2c5
new build system: accept more directory options
Mychaela Falconia <falcon@freecalypso.org>
parents:
453
diff
changeset
|
41 install -c ${PROGS} ${DESTDIR}${bindir} |
17
68a7e86c9868
frtest/Makefile: add install
Mychaela Falconia <falcon@freecalypso.org>
parents:
14
diff
changeset
|
42 |
12
f88817a233fb
gsmfr-decode test program written
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
43 clean: |
f88817a233fb
gsmfr-decode test program written
Mychaela Falconia <falcon@freecalypso.org>
parents:
diff
changeset
|
44 rm -f *.o *.out ${PROGS} |