OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 audio.release()); | 70 audio.release()); |
71 | 71 |
72 video->AddCodec(cricket::VideoCodec(120, "VP8", 640, 480, 30, 0)); | 72 video->AddCodec(cricket::VideoCodec(120, "VP8", 640, 480, 30, 0)); |
73 desc->AddContent(cricket::CN_VIDEO, cricket::NS_JINGLE_RTP, | 73 desc->AddContent(cricket::CN_VIDEO, cricket::NS_JINGLE_RTP, |
74 video.release()); | 74 video.release()); |
75 | 75 |
76 EXPECT_TRUE(desc->AddTransportInfo( | 76 EXPECT_TRUE(desc->AddTransportInfo( |
77 cricket::TransportInfo( | 77 cricket::TransportInfo( |
78 cricket::CN_AUDIO, | 78 cricket::CN_AUDIO, |
79 cricket::TransportDescription( | 79 cricket::TransportDescription( |
80 cricket::NS_GINGLE_P2P, | |
81 std::vector<std::string>(), | 80 std::vector<std::string>(), |
82 kCandidateUfragVoice, kCandidatePwdVoice, | 81 kCandidateUfragVoice, kCandidatePwdVoice, |
83 cricket::ICEMODE_FULL, | 82 cricket::ICEMODE_FULL, |
84 cricket::CONNECTIONROLE_NONE, | 83 cricket::CONNECTIONROLE_NONE, |
85 NULL, cricket::Candidates())))); | 84 NULL, cricket::Candidates())))); |
86 EXPECT_TRUE(desc->AddTransportInfo( | 85 EXPECT_TRUE(desc->AddTransportInfo( |
87 cricket::TransportInfo(cricket::CN_VIDEO, | 86 cricket::TransportInfo(cricket::CN_VIDEO, |
88 cricket::TransportDescription( | 87 cricket::TransportDescription( |
89 cricket::NS_GINGLE_P2P, | |
90 std::vector<std::string>(), | 88 std::vector<std::string>(), |
91 kCandidateUfragVideo, kCandidatePwdVideo, | 89 kCandidateUfragVideo, kCandidatePwdVideo, |
92 cricket::ICEMODE_FULL, | 90 cricket::ICEMODE_FULL, |
93 cricket::CONNECTIONROLE_NONE, | 91 cricket::CONNECTIONROLE_NONE, |
94 NULL, cricket::Candidates())))); | 92 NULL, cricket::Candidates())))); |
95 return desc; | 93 return desc; |
96 } | 94 } |
97 | 95 |
98 class JsepSessionDescriptionTest : public testing::Test { | 96 class JsepSessionDescriptionTest : public testing::Test { |
99 protected: | 97 protected: |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate)); | 236 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate)); |
239 std::string sdp_with_candidate = Serialize(jsep_desc_.get()); | 237 std::string sdp_with_candidate = Serialize(jsep_desc_.get()); |
240 EXPECT_NE(sdp, sdp_with_candidate); | 238 EXPECT_NE(sdp, sdp_with_candidate); |
241 | 239 |
242 scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc( | 240 scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc( |
243 DeSerialize(sdp_with_candidate)); | 241 DeSerialize(sdp_with_candidate)); |
244 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get()); | 242 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get()); |
245 | 243 |
246 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate); | 244 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate); |
247 } | 245 } |
OLD | NEW |