diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2008-11-11 11:51:18 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2008-11-11 11:51:18 +0000 |
| commit | b94da8ea513e852ec890bb3ac9dc5f940a369a13 (patch) | |
| tree | ca188206a5c252fd46aea76206a099cc679930f5 /pjsip-apps | |
| parent | 26285698ba209f5f8bc7e10be922da2efdcaae86 (diff) | |
Ticket #674:
- Updated SDP negotiation module to allow special treatment for AMR negotiation.
- Fixed SDP negotiation when it prefers local codec order it gets wrong in identifying the remote offer.
- Added some test scripts to test AMR negotiation.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2364 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
3 files changed, 95 insertions, 0 deletions
diff --git a/pjsip-apps/src/test-pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py b/pjsip-apps/src/test-pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py new file mode 100644 index 00000000..87a2dfaf --- /dev/null +++ b/pjsip-apps/src/test-pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py @@ -0,0 +1,32 @@ +# $Id $ +import inc_sip as sip +import inc_sdp as sdp + +# Answer for codec AMR should contain fmtp octet-align=1 + +sdp = \ +""" +v=0 +o=- 3428650655 3428650655 IN IP4 192.168.1.9 +s=pjmedia +c=IN IP4 192.168.1.9 +t=0 0 +a=X-nat:0 +m=audio 4000 RTP/AVP 99 101 +a=rtcp:4001 IN IP4 192.168.1.9 +a=rtpmap:99 AMR/8000 +a=fmtp:99 octet-align=1 +a=sendrecv +a=rtpmap:101 telephone-event/8000 +a=fmtp:101 0-15 +""" + +pjsua_args = "--null-audio --auto-answer 200 --add-codec AMR" +extra_headers = "" +include = ["octet-align=1"] # response must include 'octet-align=1' +exclude = [] + +sendto_cfg = sip.SendtoCfg("AMR negotiation should response with fmtp 'octet-align=1'", pjsua_args, sdp, 200, + extra_headers=extra_headers, + resp_inc=include, resp_exc=exclude) + diff --git a/pjsip-apps/src/test-pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py b/pjsip-apps/src/test-pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py new file mode 100644 index 00000000..44a2c306 --- /dev/null +++ b/pjsip-apps/src/test-pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py @@ -0,0 +1,31 @@ +# $Id $ +import inc_sip as sip +import inc_sdp as sdp + +# Answer for codec AMR should not contain fmtp octet-align=1 + +sdp = \ +""" +v=0 +o=- 3428650655 3428650655 IN IP4 192.168.1.9 +s=pjmedia +c=IN IP4 192.168.1.9 +t=0 0 +a=X-nat:0 +m=audio 4000 RTP/AVP 99 101 +a=rtcp:4001 IN IP4 192.168.1.9 +a=rtpmap:99 AMR/8000 +a=sendrecv +a=rtpmap:101 telephone-event/8000 +a=fmtp:101 0-15 +""" + +pjsua_args = "--null-audio --auto-answer 200 --add-codec AMR" +extra_headers = "" +include = [""] +exclude = ["octet-align=1"] # response must not include fmtp 'octet-align=1' + +sendto_cfg = sip.SendtoCfg("AMR negotiation should not contain 'octet-align=1'", pjsua_args, sdp, 200, + extra_headers=extra_headers, + resp_inc=include, resp_exc=exclude) + diff --git a/pjsip-apps/src/test-pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py b/pjsip-apps/src/test-pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py new file mode 100644 index 00000000..e69102c1 --- /dev/null +++ b/pjsip-apps/src/test-pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py @@ -0,0 +1,32 @@ +# $Id $ +import inc_sip as sip +import inc_sdp as sdp + +# Answer for codec AMR should not contain fmtp octet-align=1 + +sdp = \ +""" +v=0 +o=- 3428650655 3428650655 IN IP4 192.168.1.9 +s=pjmedia +c=IN IP4 192.168.1.9 +t=0 0 +a=X-nat:0 +m=audio 4000 RTP/AVP 99 101 +a=rtcp:4001 IN IP4 192.168.1.9 +a=rtpmap:99 AMR/8000 +a=fmtp:99 octet-align=0 +a=sendrecv +a=rtpmap:101 telephone-event/8000 +a=fmtp:101 0-15 +""" + +pjsua_args = "--null-audio --auto-answer 200 --add-codec AMR" +extra_headers = "" +include = [""] +exclude = ["octet-align=1"] # response must not include fmtp 'octet-align=1' + +sendto_cfg = sip.SendtoCfg("AMR negotiation should not contain 'octet-align=1'", pjsua_args, sdp, 200, + extra_headers=extra_headers, + resp_inc=include, resp_exc=exclude) + |