diff options
| author | Jean-Francois Dionne <jf.dionne@nutaq.com> | 2017-01-10 10:23:56 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-01-10 23:28:12 +0000 |
| commit | d02c8af6ccb73a18dba5d09112730246d05c187d (patch) | |
| tree | fa3408d6ec387386b2b42aa8b22b9757ada74023 | |
| parent | 85908a9c2f218b6665b8e90005b900c74875e806 (diff) | |
DTX: fix AMR SID-FIRST detection
Max's note: adjusted test output.
Change-Id: I46477c631bf86345cb757f31d7f2e2935b12adcc
Related: OS#1801
| -rw-r--r-- | src/codec/gsm690.c | 4 | ||||
| -rw-r--r-- | tests/codec/codec_test.ok | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/codec/gsm690.c b/src/codec/gsm690.c index c3cb9324..b273f0fe 100644 --- a/src/codec/gsm690.c +++ b/src/codec/gsm690.c @@ -215,7 +215,7 @@ const uint16_t gsm690_4_75_bitorder[95] = { }; static const uint8_t amr_len_by_ft[16] = { - 12, 13, 15, 17, 19, 20, 26, 31, 0, 0, 0, 0, 0, 0, 0, 0 + 12, 13, 15, 17, 19, 20, 26, 31, 7, 0, 0, 0, 0, 0, 0, 0 }; const struct value_string osmo_amr_type_names[] = { @@ -262,7 +262,7 @@ int osmo_amr_rtp_dec(const uint8_t *rtppayload, int payload_len, uint8_t *cmr, if (rtppayload[1] >> 7) return -ENOTSUP; - if (payload_len - 2 < amr_len_by_ft[type]) + if (payload_len < amr_len_by_ft[type]) return -ENOTSUP; if (ft) diff --git a/tests/codec/codec_test.ok b/tests/codec/codec_test.ok index 2af7cc71..80c4a099 100644 --- a/tests/codec/codec_test.ok +++ b/tests/codec/codec_test.ok @@ -1,6 +1,6 @@ AMR RTP payload decoder test: -[2] decode RTP 20 44 00 00 00 00 04 OK: FT AMR SID, CMR AMR 5,90 kbit/s, CMI is 2, SID type FIRST [2] encode [0] -[2] decode RTP 20 44 29 c2 92 91 f4 OK: FT AMR SID, CMR AMR 5,90 kbit/s, CMI is 2, SID type UPDATE [2] encode [0] +[9] decode RTP 20 44 00 00 00 00 04 OK: FT AMR SID, CMR AMR 5,90 kbit/s, CMI is 2, SID type FIRST [9] encode [0] +[9] decode RTP 20 44 29 c2 92 91 f4 OK: FT AMR SID, CMR AMR 5,90 kbit/s, CMI is 2, SID type UPDATE [9] encode [0] [2/2] No Data/NA, CMR: OK, FT: OK, BFI: OK, CMI: -1, STI: -1 [2/2] No Data/NA, CMR: OK, FT: OK, BFI: OK, CMI: -1, STI: -1 [33/33] AMR 12,2 kbit/s (GSM-EFR), CMR: OK, FT: OK, BFI: OK, CMI: -1, STI: -1 |