# HG changeset patch # User Mychaela Falconia # Date 1726732337 0 # Node ID f681fb7580415dda320ab81fbcc69c9627895ec3 # Parent f3246d109e2d9b0bc58a0fdcd437fc827db843d7 libgsmfr2: add gsmfr_fulldec_rtp_in() diff -r f3246d109e2d -r f681fb758041 libgsmfr2/Makefile --- a/libgsmfr2/Makefile Thu Sep 19 07:03:12 2024 +0000 +++ b/libgsmfr2/Makefile Thu Sep 19 07:52:17 2024 +0000 @@ -1,8 +1,9 @@ OBJS= add.o comfort_noise.o dec_main.o dec_wrap.o dhf.o ed_state.o \ - enc_homing.o enc_main.o enc_wrap.o full_dec.o long_term.o lpc.o \ - pack_frame.o pack_frame2.o pp_bad.o pp_good.o pp_homing.o pp_state.o \ - preprocess.o prng.o rpe.o short_term.o sidclass.o silence_frame.o \ - table.o unpack_frame.o unpack_frame2.o xmaxc_mean.o + enc_homing.o enc_main.o enc_wrap.o full_dec.o full_dec_wrap.o \ + long_term.o lpc.o pack_frame.o pack_frame2.o pp_bad.o pp_good.o \ + pp_homing.o pp_state.o preprocess.o prng.o rpe.o short_term.o \ + sidclass.o silence_frame.o table.o unpack_frame.o unpack_frame2.o \ + xmaxc_mean.o HDRS= ed_internal.h ed_state.h pp_internal.h pp_state.h tw_gsmfr.h typedef.h LIB= libgsmfr2.a diff -r f3246d109e2d -r f681fb758041 libgsmfr2/full_dec_wrap.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgsmfr2/full_dec_wrap.c Thu Sep 19 07:52:17 2024 +0000 @@ -0,0 +1,50 @@ +/* + * This module implements a wrapper around the main processing functions + * of our full decoder, handling RTP input per TW-TS-001. + */ + +#include +#include "tw_gsmfr.h" + +int gsmfr_fulldec_rtp_in(struct gsmfr_fulldec_state *st, const uint8_t *rtp_pl, + unsigned rtp_pl_len, int16_t *pcm) +{ + switch (rtp_pl_len) { + case 0: + /* BFI-no-data, but not an invalid RTP input per se */ + gsmfr_fulldec_bfi(st, 0, pcm); + return 0; + case 1: + if ((rtp_pl[0] & 0xF6) != 0xE6) + goto bad_rtp_input; + /* TW-TS-001 No_Data frame */ + gsmfr_fulldec_bfi(st, rtp_pl[0] & 1, pcm); + return 0; + case GSMFR_RTP_FRAME_LEN: + if ((rtp_pl[0] & 0xF0) != 0xD0) + goto bad_rtp_input; + /* basic RTP format */ + gsmfr_fulldec_good_frame(st, rtp_pl, pcm); + return 0; + case GSMFR_RTP_FRAME_LEN+1: + if ((rtp_pl[0] & 0xF4) != 0xE0) + goto bad_rtp_input; + if ((rtp_pl[1] & 0xF0) != 0xD0) + goto bad_rtp_input; + /* extended RTP format (TW-TS-001) */ + if (rtp_pl[0] & 0x02) + gsmfr_fulldec_bfi_bits(st, rtp_pl + 1, rtp_pl[0] & 1, + pcm); + else + gsmfr_fulldec_good_frame(st, rtp_pl + 1, pcm); + return 0; + default: + bad_rtp_input: + /* + * Treat it like BFI-no-data, and tell the caller + * that we received an invalid RTP payload. + */ + gsmfr_fulldec_bfi(st, 0, pcm); + return -1; + } +} diff -r f3246d109e2d -r f681fb758041 libgsmfr2/tw_gsmfr.h --- a/libgsmfr2/tw_gsmfr.h Thu Sep 19 07:03:12 2024 +0000 +++ b/libgsmfr2/tw_gsmfr.h Thu Sep 19 07:52:17 2024 +0000 @@ -119,6 +119,11 @@ void gsmfr_fulldec_bfi_bits(struct gsmfr_fulldec_state *state, const uint8_t *bad_frame, int taf, int16_t *pcm); +/* handling of TW-TS-001 RTP input */ +int gsmfr_fulldec_rtp_in(struct gsmfr_fulldec_state *state, + const uint8_t *rtp_pl, unsigned rtp_pl_len, + int16_t *pcm); + /* utility datum */ extern const uint8_t gsmfr_decoder_homing_frame[GSMFR_RTP_FRAME_LEN];