diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2010-06-04 13:41:34 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2010-06-04 13:41:34 +0000 |
| commit | 01483432d459b7fe5637929328a701e0c3f4fdd8 (patch) | |
| tree | 7476677bdf9c29a14675b079e5fb55c155785a73 /pjmedia/src/test | |
| parent | 0c88735614f5caca1fb6899e59977b865cc72c28 (diff) | |
Re #668:
- Fixed process_answer() of SDP negotiation, when no common format in a media, instead of returning error, it should just deactivate the media (offer & answer) and continue negotiating next media.
- Generalized the way of deactivating media: set port to 0 and remove all attributes.
- Added new API pjmedia_sdp_media_clone_deactivate() to clone media and deactivate the newly cloned media.
- Updated PJMEDIA SDP negotiation test.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3198 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/test')
| -rw-r--r-- | pjmedia/src/test/sdp_neg_test.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/pjmedia/src/test/sdp_neg_test.c b/pjmedia/src/test/sdp_neg_test.c index 87317156..72d29963 100644 --- a/pjmedia/src/test/sdp_neg_test.c +++ b/pjmedia/src/test/sdp_neg_test.c @@ -96,7 +96,7 @@ static struct test "m=audio 49170 RTP/AVP 0\r\n" "a=rtpmap:0 PCMU/8000\r\n" "m=video 0 RTP/AVP 31\r\n" - "a=rtpmap:31 H261/90000\r\n" + //"a=rtpmap:31 H261/90000\r\n" /* <-- this is not necessary (port 0) */ "m=video 53000 RTP/AVP 32\r\n" "a=rtpmap:32 MPV/90000\r\n" }, @@ -129,12 +129,13 @@ static struct test "m=audio 49170 RTP/AVP 0\r\n" "a=rtpmap:0 PCMU/8000\r\n" "m=video 0 RTP/AVP 31\r\n" - //"a=rtpmap:31 H261/90000\r\n" /* <-- this is not necessary */ + //"a=rtpmap:31 H261/90000\r\n" /* <-- this is not necessary (port 0) */ "m=video 53000 RTP/AVP 32\r\n" "a=rtpmap:32 MPV/90000\r\n" "m=audio 0 RTP/AVP 110\r\n" - "a=rtpmap:110 telephone-events/8000\r\n" - "a=sendonly\r\n" + /* <-- the following attributes are not necessary (port 0) */ + //"a=rtpmap:110 telephone-events/8000\r\n" + //"a=sendonly\r\n" } } }, @@ -555,8 +556,10 @@ static struct test "m=audio 49170 RTP/AVP 0 8\r\n" "a=rtpmap:0 PCMU/8000\r\n" "a=rtpmap:8 PCMA/8000\r\n" - "m=video 0 RTP/AVP 31\r\n" - "a=rtpmap:31 H261/90000\r\n" + // By #1088, the formats won't be negotiated when the media has port 0. + //"m=video 0 RTP/AVP 31\r\n" + "m=video 0 RTP/AVP 31 32\r\n" + //"a=rtpmap:31 H261/90000\r\n" /* <-- this is not necessary (port 0) */ }, { LOCAL_OFFER, @@ -589,7 +592,7 @@ static struct test "m=audio 51372 RTP/AVP 0\r\n" "a=rtpmap:0 PCMU/8000\r\n" "m=video 0 RTP/AVP 31\r\n" - "a=rtpmap:31 H261/90000\r\n" + //"a=rtpmap:31 H261/90000\r\n" /* <-- this is not necessary (port 0) */ } } }, @@ -665,7 +668,7 @@ static struct test "m=audio 49172 RTP/AVP 0\r\n" "a=rtpmap:0 PCMU/8000\r\n" "m=video 0 RTP/AVP 31\r\n" - "a=rtpmap:31 H261/90000\r\n" + //"a=rtpmap:31 H261/90000\r\n" /* <-- this is not necessary (port 0) */ } } }, @@ -816,7 +819,7 @@ static struct test "c=IN IP4 host.atlanta.example.com\r\n" "t=0 0\r\n" "m=audio 0 RTP/AVP 0\r\n" - "a=rtpmap:0 PCMU/8000\r\n" + //"a=rtpmap:0 PCMU/8000\r\n" /* <-- this is not necessary (port 0) */ "m=audio 51372 RTP/AVP 97 101\r\n" "a=rtpmap:97 iLBC/8000\r\n" "a=rtpmap:101 telephone-event/8000\r\n" @@ -870,7 +873,7 @@ static struct test "c=IN IP4 host.biloxi.example.com\r\n" "t=0 0\r\n" "m=audio 0 RTP/AVP 0\r\n" - "a=rtpmap:0 PCMU/8000\r\n" + //"a=rtpmap:0 PCMU/8000\r\n" /* <-- this is not necessary (port 0) */ "m=audio 49170 RTP/AVP 97 101\r\n" "a=rtpmap:97 iLBC/8000\r\n" "a=rtpmap:101 telephone-event/8000\r\n", @@ -916,7 +919,7 @@ static struct test "m=audio 49170 RTP/AVP 0\r\n" "a=rtpmap:0 PCMU/8000\r\n" "m=video 0 RTP/AVP 31\r\n" - "a=rtpmap:31 H261/90000\r\n" + //"a=rtpmap:31 H261/90000\r\n" /* <-- this is not necessary (port 0) */ "", } } @@ -962,7 +965,7 @@ static struct test "m=audio 3000 RTP/AVP 0\r\n" "a=rtpmap:0 PCMU/8000\r\n" "m=video 0 RTP/AVP 31\r\n" - "a=rtpmap:31 H261/90000\r\n" + //"a=rtpmap:31 H261/90000\r\n" /* <-- this is not necessary (port 0) */ "", } } @@ -1052,9 +1055,9 @@ static struct test "m=audio 5200 RTP/AVP 0\r\n" "a=rtpmap:0 PCMU/8000\r\n" "m=audio 0 RTP/AVP 0\r\n" - "a=rtpmap:0 PCMU/8000\r\n" + //"a=rtpmap:0 PCMU/8000\r\n" /* <-- this is not necessary (port 0) */ "m=video 0 RTP/AVP 31\r\n" - "a=rtpmap:31 H261/90000\r\n" + //"a=rtpmap:31 H261/90000\r\n" /* <-- this is not necessary (port 0) */ "", } } @@ -1230,7 +1233,7 @@ static struct test "m=audio 7000 RTP/AVP 0\r\n" "a=rtpmap:0 PCMU/8000\r\n" "m=audio 0 RTP/AVP 0\r\n" - "a=rtpmap:0 PCMU/8000\r\n" + //"a=rtpmap:0 PCMU/8000\r\n" /* <-- this is not necessary (port 0) */ "m=video 5000 RTP/AVP 31\r\n" "a=rtpmap:31 H261/90000\r\n" "", |