OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 const std::string current_video_ufrag = "current_video_ufrag"; | 283 const std::string current_video_ufrag = "current_video_ufrag"; |
284 const std::string current_video_pwd = "current_video_pwd"; | 284 const std::string current_video_pwd = "current_video_pwd"; |
285 const std::string current_data_ufrag = "current_data_ufrag"; | 285 const std::string current_data_ufrag = "current_data_ufrag"; |
286 const std::string current_data_pwd = "current_data_pwd"; | 286 const std::string current_data_pwd = "current_data_pwd"; |
287 rtc::scoped_ptr<SessionDescription> current_desc; | 287 rtc::scoped_ptr<SessionDescription> current_desc; |
288 rtc::scoped_ptr<SessionDescription> desc; | 288 rtc::scoped_ptr<SessionDescription> desc; |
289 if (has_current_desc) { | 289 if (has_current_desc) { |
290 current_desc.reset(new SessionDescription()); | 290 current_desc.reset(new SessionDescription()); |
291 EXPECT_TRUE(current_desc->AddTransportInfo( | 291 EXPECT_TRUE(current_desc->AddTransportInfo( |
292 TransportInfo("audio", | 292 TransportInfo("audio", |
293 TransportDescription("", | 293 TransportDescription(current_audio_ufrag, |
294 current_audio_ufrag, | |
295 current_audio_pwd)))); | 294 current_audio_pwd)))); |
296 EXPECT_TRUE(current_desc->AddTransportInfo( | 295 EXPECT_TRUE(current_desc->AddTransportInfo( |
297 TransportInfo("video", | 296 TransportInfo("video", |
298 TransportDescription("", | 297 TransportDescription(current_video_ufrag, |
299 current_video_ufrag, | |
300 current_video_pwd)))); | 298 current_video_pwd)))); |
301 EXPECT_TRUE(current_desc->AddTransportInfo( | 299 EXPECT_TRUE(current_desc->AddTransportInfo( |
302 TransportInfo("data", | 300 TransportInfo("data", |
303 TransportDescription("", | 301 TransportDescription(current_data_ufrag, |
304 current_data_ufrag, | |
305 current_data_pwd)))); | 302 current_data_pwd)))); |
306 } | 303 } |
307 if (offer) { | 304 if (offer) { |
308 desc.reset(f1_.CreateOffer(options, current_desc.get())); | 305 desc.reset(f1_.CreateOffer(options, current_desc.get())); |
309 } else { | 306 } else { |
310 rtc::scoped_ptr<SessionDescription> offer; | 307 rtc::scoped_ptr<SessionDescription> offer; |
311 offer.reset(f1_.CreateOffer(options, NULL)); | 308 offer.reset(f1_.CreateOffer(options, NULL)); |
312 desc.reset(f1_.CreateAnswer(offer.get(), options, current_desc.get())); | 309 desc.reset(f1_.CreateAnswer(offer.get(), options, current_desc.get())); |
313 } | 310 } |
314 ASSERT_TRUE(desc.get() != NULL); | 311 ASSERT_TRUE(desc.get() != NULL); |
(...skipping 1991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2306 offer.reset(f1_.CreateOffer(options, NULL)); | 2303 offer.reset(f1_.CreateOffer(options, NULL)); |
2307 ASSERT_TRUE(offer.get() != NULL); | 2304 ASSERT_TRUE(offer.get() != NULL); |
2308 audio_content = offer->GetContentByName("audio"); | 2305 audio_content = offer->GetContentByName("audio"); |
2309 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); | 2306 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); |
2310 rtc::scoped_ptr<SessionDescription> answer( | 2307 rtc::scoped_ptr<SessionDescription> answer( |
2311 f1_.CreateAnswer(offer.get(), options, NULL)); | 2308 f1_.CreateAnswer(offer.get(), options, NULL)); |
2312 ASSERT_TRUE(answer.get() != NULL); | 2309 ASSERT_TRUE(answer.get() != NULL); |
2313 audio_content = answer->GetContentByName("audio"); | 2310 audio_content = answer->GetContentByName("audio"); |
2314 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); | 2311 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); |
2315 } | 2312 } |
OLD | NEW |