OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 30 matching lines...) Expand all Loading... |
41 static cricket::SessionDescription* CreateCricketSessionDescription() { | 41 static cricket::SessionDescription* CreateCricketSessionDescription() { |
42 cricket::SessionDescription* desc(new cricket::SessionDescription()); | 42 cricket::SessionDescription* desc(new cricket::SessionDescription()); |
43 // AudioContentDescription | 43 // AudioContentDescription |
44 scoped_ptr<cricket::AudioContentDescription> audio( | 44 scoped_ptr<cricket::AudioContentDescription> audio( |
45 new cricket::AudioContentDescription()); | 45 new cricket::AudioContentDescription()); |
46 | 46 |
47 // VideoContentDescription | 47 // VideoContentDescription |
48 scoped_ptr<cricket::VideoContentDescription> video( | 48 scoped_ptr<cricket::VideoContentDescription> video( |
49 new cricket::VideoContentDescription()); | 49 new cricket::VideoContentDescription()); |
50 | 50 |
51 audio->AddCodec(cricket::AudioCodec(103, "ISAC", 16000, 0, 0, 0)); | 51 audio->AddCodec(cricket::AudioCodec(103, "ISAC", 16000, 0, 0)); |
52 desc->AddContent(cricket::CN_AUDIO, cricket::NS_JINGLE_RTP, | 52 desc->AddContent(cricket::CN_AUDIO, cricket::NS_JINGLE_RTP, |
53 audio.release()); | 53 audio.release()); |
54 | 54 |
55 video->AddCodec(cricket::VideoCodec(120, "VP8", 640, 480, 30, 0)); | 55 video->AddCodec(cricket::VideoCodec(120, "VP8", 640, 480, 30)); |
56 desc->AddContent(cricket::CN_VIDEO, cricket::NS_JINGLE_RTP, | 56 desc->AddContent(cricket::CN_VIDEO, cricket::NS_JINGLE_RTP, |
57 video.release()); | 57 video.release()); |
58 | 58 |
59 EXPECT_TRUE(desc->AddTransportInfo(cricket::TransportInfo( | 59 EXPECT_TRUE(desc->AddTransportInfo(cricket::TransportInfo( |
60 cricket::CN_AUDIO, | 60 cricket::CN_AUDIO, |
61 cricket::TransportDescription( | 61 cricket::TransportDescription( |
62 std::vector<std::string>(), kCandidateUfragVoice, kCandidatePwdVoice, | 62 std::vector<std::string>(), kCandidateUfragVoice, kCandidatePwdVoice, |
63 cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_NONE, NULL)))); | 63 cricket::ICEMODE_FULL, cricket::CONNECTIONROLE_NONE, NULL)))); |
64 EXPECT_TRUE(desc->AddTransportInfo(cricket::TransportInfo( | 64 EXPECT_TRUE(desc->AddTransportInfo(cricket::TransportInfo( |
65 cricket::CN_VIDEO, | 65 cricket::CN_VIDEO, |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate)); | 221 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate)); |
222 std::string sdp_with_candidate = Serialize(jsep_desc_.get()); | 222 std::string sdp_with_candidate = Serialize(jsep_desc_.get()); |
223 EXPECT_NE(sdp, sdp_with_candidate); | 223 EXPECT_NE(sdp, sdp_with_candidate); |
224 | 224 |
225 scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc( | 225 scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc( |
226 DeSerialize(sdp_with_candidate)); | 226 DeSerialize(sdp_with_candidate)); |
227 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get()); | 227 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get()); |
228 | 228 |
229 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate); | 229 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate); |
230 } | 230 } |
OLD | NEW |