OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 "a=candidate:a0+B/3 1 udp 2130706432 74.125.127.126 2345 typ srflx " | 146 "a=candidate:a0+B/3 1 udp 2130706432 74.125.127.126 2345 typ srflx " |
147 "raddr 192.168.1.5 rport 2346 " | 147 "raddr 192.168.1.5 rport 2346 " |
148 "generation 2\r\n" | 148 "generation 2\r\n" |
149 "a=candidate:a0+B/3 2 udp 2130706432 74.125.127.126 2347 typ srflx " | 149 "a=candidate:a0+B/3 2 udp 2130706432 74.125.127.126 2347 typ srflx " |
150 "raddr 192.168.1.5 rport 2348 " | 150 "raddr 192.168.1.5 rport 2348 " |
151 "generation 2\r\n" | 151 "generation 2\r\n" |
152 "a=ice-ufrag:ufrag_voice\r\na=ice-pwd:pwd_voice\r\n" | 152 "a=ice-ufrag:ufrag_voice\r\na=ice-pwd:pwd_voice\r\n" |
153 "a=mid:audio_content_name\r\n" | 153 "a=mid:audio_content_name\r\n" |
154 "a=sendrecv\r\n" | 154 "a=sendrecv\r\n" |
155 "a=rtcp-mux\r\n" | 155 "a=rtcp-mux\r\n" |
| 156 "a=rtcp-rsize\r\n" |
156 "a=crypto:1 AES_CM_128_HMAC_SHA1_32 " | 157 "a=crypto:1 AES_CM_128_HMAC_SHA1_32 " |
157 "inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32 " | 158 "inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32 " |
158 "dummy_session_params\r\n" | 159 "dummy_session_params\r\n" |
159 "a=rtpmap:111 opus/48000/2\r\n" | 160 "a=rtpmap:111 opus/48000/2\r\n" |
160 "a=rtpmap:103 ISAC/16000\r\n" | 161 "a=rtpmap:103 ISAC/16000\r\n" |
161 "a=rtpmap:104 ISAC/32000\r\n" | 162 "a=rtpmap:104 ISAC/32000\r\n" |
162 "a=ssrc:1 cname:stream_1_cname\r\n" | 163 "a=ssrc:1 cname:stream_1_cname\r\n" |
163 "a=ssrc:1 msid:local_stream_1 audio_track_id_1\r\n" | 164 "a=ssrc:1 msid:local_stream_1 audio_track_id_1\r\n" |
164 "a=ssrc:1 mslabel:local_stream_1\r\n" | 165 "a=ssrc:1 mslabel:local_stream_1\r\n" |
165 "a=ssrc:1 label:audio_track_id_1\r\n" | 166 "a=ssrc:1 label:audio_track_id_1\r\n" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 "s=-\r\n" | 214 "s=-\r\n" |
214 "t=0 0\r\n" | 215 "t=0 0\r\n" |
215 "a=msid-semantic: WMS local_stream_1 local_stream_2\r\n" | 216 "a=msid-semantic: WMS local_stream_1 local_stream_2\r\n" |
216 "m=audio 9 RTP/SAVPF 111 103 104\r\n" | 217 "m=audio 9 RTP/SAVPF 111 103 104\r\n" |
217 "c=IN IP4 0.0.0.0\r\n" | 218 "c=IN IP4 0.0.0.0\r\n" |
218 "a=rtcp:9 IN IP4 0.0.0.0\r\n" | 219 "a=rtcp:9 IN IP4 0.0.0.0\r\n" |
219 "a=ice-ufrag:ufrag_voice\r\na=ice-pwd:pwd_voice\r\n" | 220 "a=ice-ufrag:ufrag_voice\r\na=ice-pwd:pwd_voice\r\n" |
220 "a=mid:audio_content_name\r\n" | 221 "a=mid:audio_content_name\r\n" |
221 "a=sendrecv\r\n" | 222 "a=sendrecv\r\n" |
222 "a=rtcp-mux\r\n" | 223 "a=rtcp-mux\r\n" |
| 224 "a=rtcp-rsize\r\n" |
223 "a=crypto:1 AES_CM_128_HMAC_SHA1_32 " | 225 "a=crypto:1 AES_CM_128_HMAC_SHA1_32 " |
224 "inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32 " | 226 "inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32 " |
225 "dummy_session_params\r\n" | 227 "dummy_session_params\r\n" |
226 "a=rtpmap:111 opus/48000/2\r\n" | 228 "a=rtpmap:111 opus/48000/2\r\n" |
227 "a=rtpmap:103 ISAC/16000\r\n" | 229 "a=rtpmap:103 ISAC/16000\r\n" |
228 "a=rtpmap:104 ISAC/32000\r\n" | 230 "a=rtpmap:104 ISAC/32000\r\n" |
229 "a=ssrc:1 cname:stream_1_cname\r\n" | 231 "a=ssrc:1 cname:stream_1_cname\r\n" |
230 "a=ssrc:1 msid:local_stream_1 audio_track_id_1\r\n" | 232 "a=ssrc:1 msid:local_stream_1 audio_track_id_1\r\n" |
231 "a=ssrc:1 mslabel:local_stream_1\r\n" | 233 "a=ssrc:1 mslabel:local_stream_1\r\n" |
232 "a=ssrc:1 label:audio_track_id_1\r\n" | 234 "a=ssrc:1 label:audio_track_id_1\r\n" |
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
697 JsepIceCandidate jice(mline_id, | 699 JsepIceCandidate jice(mline_id, |
698 mline_index, | 700 mline_index, |
699 candidates_.at(i)); | 701 candidates_.at(i)); |
700 jdesc_.AddCandidate(&jice); | 702 jdesc_.AddCandidate(&jice); |
701 } | 703 } |
702 } | 704 } |
703 | 705 |
704 AudioContentDescription* CreateAudioContentDescription() { | 706 AudioContentDescription* CreateAudioContentDescription() { |
705 AudioContentDescription* audio = new AudioContentDescription(); | 707 AudioContentDescription* audio = new AudioContentDescription(); |
706 audio->set_rtcp_mux(true); | 708 audio->set_rtcp_mux(true); |
| 709 audio->set_rtcp_reduced_size(true); |
707 StreamParams audio_stream1; | 710 StreamParams audio_stream1; |
708 audio_stream1.id = kAudioTrackId1; | 711 audio_stream1.id = kAudioTrackId1; |
709 audio_stream1.cname = kStream1Cname; | 712 audio_stream1.cname = kStream1Cname; |
710 audio_stream1.sync_label = kStreamLabel1; | 713 audio_stream1.sync_label = kStreamLabel1; |
711 audio_stream1.ssrcs.push_back(kAudioTrack1Ssrc); | 714 audio_stream1.ssrcs.push_back(kAudioTrack1Ssrc); |
712 audio->AddStream(audio_stream1); | 715 audio->AddStream(audio_stream1); |
713 StreamParams audio_stream2; | 716 StreamParams audio_stream2; |
714 audio_stream2.id = kAudioTrackId2; | 717 audio_stream2.id = kAudioTrackId2; |
715 audio_stream2.cname = kStream2Cname; | 718 audio_stream2.cname = kStream2Cname; |
716 audio_stream2.sync_label = kStreamLabel2; | 719 audio_stream2.sync_label = kStreamLabel2; |
(...skipping 11 matching lines...) Expand all Loading... |
728 const MCD* cd2) { | 731 const MCD* cd2) { |
729 // type | 732 // type |
730 EXPECT_EQ(cd1->type(), cd1->type()); | 733 EXPECT_EQ(cd1->type(), cd1->type()); |
731 | 734 |
732 // content direction | 735 // content direction |
733 EXPECT_EQ(cd1->direction(), cd2->direction()); | 736 EXPECT_EQ(cd1->direction(), cd2->direction()); |
734 | 737 |
735 // rtcp_mux | 738 // rtcp_mux |
736 EXPECT_EQ(cd1->rtcp_mux(), cd2->rtcp_mux()); | 739 EXPECT_EQ(cd1->rtcp_mux(), cd2->rtcp_mux()); |
737 | 740 |
| 741 // rtcp_reduced_size |
| 742 EXPECT_EQ(cd1->rtcp_reduced_size(), cd2->rtcp_reduced_size()); |
| 743 |
738 // cryptos | 744 // cryptos |
739 EXPECT_EQ(cd1->cryptos().size(), cd2->cryptos().size()); | 745 EXPECT_EQ(cd1->cryptos().size(), cd2->cryptos().size()); |
740 if (cd1->cryptos().size() != cd2->cryptos().size()) { | 746 if (cd1->cryptos().size() != cd2->cryptos().size()) { |
741 ADD_FAILURE(); | 747 ADD_FAILURE(); |
742 return; | 748 return; |
743 } | 749 } |
744 for (size_t i = 0; i< cd1->cryptos().size(); ++i) { | 750 for (size_t i = 0; i< cd1->cryptos().size(); ++i) { |
745 const CryptoParams c1 = cd1->cryptos().at(i); | 751 const CryptoParams c1 = cd1->cryptos().at(i); |
746 const CryptoParams c2 = cd2->cryptos().at(i); | 752 const CryptoParams c2 = cd2->cryptos().at(i); |
747 EXPECT_TRUE(c1.Matches(c2)); | 753 EXPECT_TRUE(c1.Matches(c2)); |
(...skipping 1953 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2701 const cricket::MediaContentDescription* mdesc = | 2707 const cricket::MediaContentDescription* mdesc = |
2702 static_cast<const cricket::MediaContentDescription*>( | 2708 static_cast<const cricket::MediaContentDescription*>( |
2703 desc->contents()[i].description); | 2709 desc->contents()[i].description); |
2704 EXPECT_EQ(media_types[media_content_in_sdp[i]], mdesc->type()); | 2710 EXPECT_EQ(media_types[media_content_in_sdp[i]], mdesc->type()); |
2705 } | 2711 } |
2706 | 2712 |
2707 std::string serialized_sdp = webrtc::SdpSerialize(jdesc); | 2713 std::string serialized_sdp = webrtc::SdpSerialize(jdesc); |
2708 EXPECT_EQ(sdp_string, serialized_sdp); | 2714 EXPECT_EQ(sdp_string, serialized_sdp); |
2709 } | 2715 } |
2710 } | 2716 } |
OLD | NEW |