fully use new AMR fmtp matching
Enable fmtp matching in sdp_audio_codecs_by_descr(). This has profound effects on the codec_filter and other loops that collect codec matches. By properly matching the meaning of fmtp, msc_vlr_test_call.c now works as expected: all AMR variants are picked up properly. Adjust expectations. Change-Id: I63dc27e76243074ae0f019d219cae4412d322a84
This commit is contained in:
parent
00f8fcbc86
commit
3cd26dc53b
|
@ -281,7 +281,7 @@ struct sdp_audio_codec *sdp_audio_codecs_by_descr(struct sdp_audio_codecs *ac, c
|
||||||
{
|
{
|
||||||
struct sdp_audio_codec *i;
|
struct sdp_audio_codec *i;
|
||||||
sdp_audio_codecs_foreach(i, ac) {
|
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 i;
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -871,32 +871,27 @@ struct codec_test {
|
||||||
LIST_END \
|
LIST_END \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define SDP_CODECS_ALL_GSM \
|
||||||
/* EXPECTED FAILURE: These entries are currently missing until upcoming patches are merged:
|
{ \
|
||||||
|
"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=7#114", \
|
||||||
"AMR:octet-align=1;mode-set=0,2,4#115", \
|
"AMR:octet-align=1;mode-set=0,2,4#115", \
|
||||||
"AMR:mode-set=0,2,4,7#116", \
|
"AMR:mode-set=0,2,4,7#116", \
|
||||||
"AMR:mode-set=7#117", \
|
"AMR:mode-set=7#117", \
|
||||||
"AMR:mode-set=0,2,4#118", \
|
"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-EFR#110", \
|
||||||
"GSM#3", \
|
"GSM#3", \
|
||||||
"GSM-HR-08#111", \
|
"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=7#126", \
|
||||||
"AMR:octet-align=1;mode-set=0,2,4#125", \
|
"AMR:octet-align=1;mode-set=0,2,4#125", \
|
||||||
"AMR:mode-set=0,2,4,7#124", \
|
"AMR:mode-set=0,2,4,7#124", \
|
||||||
"AMR:mode-set=7#123", \
|
"AMR:mode-set=7#123", \
|
||||||
"AMR:mode-set=0,2,4#122", \
|
"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-EFR#110", \
|
||||||
"GSM#3", \
|
"GSM#3", \
|
||||||
"GSM-HR-08#111", \
|
"GSM-HR-08#111", \
|
||||||
|
|
Loading…
Reference in New Issue