FreeCalypso > hg > gsm-codec-lib
view libtwamr/ietf_out.c @ 477:4c9222d95647
libtwamr encoder: always emit frame->mode = mode;
In the original implementation of amr_encode_frame(), the 'mode' member
of the output struct was set to 0xFF if the output frame type is TX_NO_DATA.
This design was made to mimic the mode field (16-bit word) being set to
0xFFFF (or -1) in 3GPP test sequence format - but nothing actually depends
on this struct member being set in any way, and amr_frame_to_tseq()
generates the needed 0xFFFF on its own, based on frame->type being equal
to TX_NO_DATA.
It is simpler and more efficient to always set frame->mode to the actual
encoding mode in amr_encode_frame(), and this new behavior has already
been documented in doc/AMR-library-API description in anticipation of
the present change.
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sat, 18 May 2024 22:30:42 +0000 |
| parents | ebe499058c63 |
| children |
line wrap: on
line source
/* * The function implemented in this module is responsible for turning * struct amr_param_frame (encoder output) into an RFC 4867 payload. */ #include <stdint.h> #include "tw_amr.h" #include "typedef.h" #include "namespace.h" #include "cnst.h" #include "int_defs.h" #include "if1_func.h" static const uint8_t total_bytes_per_ft[9] = {13, 14, 16, 18, 20, 21, 27, 32, 6}; static const uint8_t first_octet_per_ft[9] = {0x04, 0x0C, 0x14, 0x1C, 0x24, 0x2C, 0x34, 0x3C, 0x44}; unsigned amr_frame_to_ietf(const struct amr_param_frame *frame, uint8_t *bytes) { Word16 serial[MAX_SERIAL_SIZE]; Word16 sti; enum Mode ft; switch (frame->type) { case TX_SPEECH_GOOD: ft = frame->mode; break; case TX_SID_FIRST: ft = MRDTX; sti = 0; break; case TX_SID_UPDATE: ft = MRDTX; sti = 1; break; case TX_NO_DATA: default: bytes[0] = 0x7C; return 1; } Prm2bits(ft, frame->param, serial); bytes[0] = first_octet_per_ft[ft]; if1_pack_bytes(ft, serial, bytes + 1); if (ft == MRDTX) { if (sti) bytes[5] |= 0x10; if (frame->mode & 1) bytes[5] |= 0x08; if (frame->mode & 2) bytes[5] |= 0x04; if (frame->mode & 4) bytes[5] |= 0x02; } return total_bytes_per_ft[ft]; }
