diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2008-08-25 13:58:25 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2008-08-25 13:58:25 +0000 |
| commit | 920d97341f9c044fd012f6b41fff01e4c9563a16 (patch) | |
| tree | d34b163083b56edc8c7196667a05000da4091358 /pjsip-apps | |
| parent | 6ddea349e453f1a4147ab10f55726079c1bc4d96 (diff) | |
Ticket #599:
- Added "dec_fmtp" and "enc_fmtp" fields to pjmedia_codec_param.setting.
- Codec factory puts its default parameters in "dec_fmtp" field.
- pjmedia_stream_info_from_sdp() puts the "fmtp" attribute in SDP to pjmedia_codec_param.
- Special treatment for fmtp "bitrate" parameter (of G722.1) during SDP negotiation
- Added maxptime field in stream_info.
- Replaced iLBC's fmtp "mode" implementation to use general fmtp mechanism.
- Added some test scripts for G722.1 bitrate negotiation.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2236 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps')
3 files changed, 104 insertions, 0 deletions
diff --git a/pjsip-apps/src/test-pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py b/pjsip-apps/src/test-pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py new file mode 100644 index 00000000..f21b4e7c --- /dev/null +++ b/pjsip-apps/src/test-pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py @@ -0,0 +1,34 @@ +# $Id $ +import inc_sip as sip +import inc_sdp as sdp + +# Answer for codec G722.1 should contain fmtp bitrate + +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 100 101 +a=rtcp:4001 IN IP4 192.168.1.9 +a=rtpmap:99 G7221/16000 +a=fmtp:99 bitrate=24000 +a=rtpmap:100 G7221/16000 +a=fmtp:100 bitrate=32000 +a=sendrecv +a=rtpmap:101 telephone-event/8000 +a=fmtp:101 0-15 +""" + +pjsua_args = "--null-audio --auto-answer 200 --add-codec G7221" +extra_headers = "" +include = ["fmtp:[\d]+ bitrate="] # response must include fmtp bitrate +exclude = [] + +sendto_cfg = sip.SendtoCfg("Answer should contain fmtp bitrate for codec G722.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/401_fmtp_g7221_with_bitrate_24000.py b/pjsip-apps/src/test-pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py new file mode 100644 index 00000000..53064ff1 --- /dev/null +++ b/pjsip-apps/src/test-pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py @@ -0,0 +1,35 @@ +# $Id $ +import inc_sip as sip +import inc_sdp as sdp + +# Answer with codec G722.1 should choose the same bitrate +# which in this test is 24000 + +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 100 101 +a=rtcp:4001 IN IP4 192.168.1.9 +a=rtpmap:100 G7221/16000 +a=fmtp:100 bitrate=24000 +a=sendrecv +a=rtpmap:101 telephone-event/8000 +a=fmtp:101 0-15 +""" + +pjsua_args = "--null-audio --auto-answer 200 --add-codec G7221" +extra_headers = "" +include = ["a=rtpmap:[\d]+ G7221/16000", # response must choose G722.1 + "fmtp:[\d]+ bitrate=24000" # response must choose the same bitrate + ] +exclude = [] + +sendto_cfg = sip.SendtoCfg("Answer with G722.1 should choose bitrate 24000", pjsua_args, sdp, 200, + extra_headers=extra_headers, + resp_inc=include, resp_exc=exclude) + diff --git a/pjsip-apps/src/test-pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py b/pjsip-apps/src/test-pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py new file mode 100644 index 00000000..d60a4a44 --- /dev/null +++ b/pjsip-apps/src/test-pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py @@ -0,0 +1,35 @@ +# $Id $ +import inc_sip as sip +import inc_sdp as sdp + +# Answer with codec G722.1 should choose the same bitrate +# which in this test is 32000 + +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 100 101 +a=rtcp:4001 IN IP4 192.168.1.9 +a=rtpmap:100 G7221/16000 +a=fmtp:100 bitrate=32000 +a=sendrecv +a=rtpmap:101 telephone-event/8000 +a=fmtp:101 0-15 +""" + +pjsua_args = "--null-audio --auto-answer 200 --add-codec G7221" +extra_headers = "" +include = ["a=rtpmap:[\d]+ G7221/16000", # response must choose G722.1 + "fmtp:[\d]+ bitrate=32000" # response must choose the same bitrate + ] +exclude = [] + +sendto_cfg = sip.SendtoCfg("Answer with G722.1 should choose bitrate 32000", pjsua_args, sdp, 200, + extra_headers=extra_headers, + resp_inc=include, resp_exc=exclude) + |