diff options
| -rw-r--r-- | src/libmsc/sdp_msg.c | 2 | ||||
| -rw-r--r-- | tests/msc_vlr/msc_vlr_test_call.c | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index c8efa4227..c6869d8ac 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -281,7 +281,7 @@ struct sdp_audio_codec *sdp_audio_codecs_by_descr(struct sdp_audio_codecs *ac, c { struct sdp_audio_codec *i; sdp_audio_codecs_foreach(i, ac) { - if (!sdp_audio_codec_cmp(i, codec, false, false)) + if (!sdp_audio_codec_cmp(i, codec, true, false)) return i; } return NULL; diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 230b9fdc6..312d1d947 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -871,32 +871,27 @@ struct codec_test { LIST_END \ } - -/* EXPECTED FAILURE: These entries are currently missing until upcoming patches are merged: +#define SDP_CODECS_ALL_GSM \ + { \ + "AMR:octet-align=1;mode-set=0,2,4,7#112", \ "AMR:octet-align=1;mode-set=7#114", \ "AMR:octet-align=1;mode-set=0,2,4#115", \ "AMR:mode-set=0,2,4,7#116", \ "AMR:mode-set=7#117", \ "AMR:mode-set=0,2,4#118", \ -*/ -#define SDP_CODECS_ALL_GSM \ - { \ - "AMR:octet-align=1;mode-set=0,2,4,7#112", \ "GSM-EFR#110", \ "GSM#3", \ "GSM-HR-08#111", \ } -/* EXPECTED FAILURE: These entries are currently missing until upcoming patches are merged: +#define SDP_CODECS_ALL_GSM_WITH_ODD_PT_NRS \ + { \ + "AMR:octet-align=1;mode-set=0,2,4,7#127", \ "AMR:octet-align=1;mode-set=7#126", \ "AMR:octet-align=1;mode-set=0,2,4#125", \ "AMR:mode-set=0,2,4,7#124", \ "AMR:mode-set=7#123", \ "AMR:mode-set=0,2,4#122", \ -*/ -#define SDP_CODECS_ALL_GSM_WITH_ODD_PT_NRS \ - { \ - "AMR:octet-align=1;mode-set=0,2,4,7#127", \ "GSM-EFR#110", \ "GSM#3", \ "GSM-HR-08#111", \ |