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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 const std::string current_video_ufrag = "current_video_ufrag"; | 288 const std::string current_video_ufrag = "current_video_ufrag"; |
289 const std::string current_video_pwd = "current_video_pwd"; | 289 const std::string current_video_pwd = "current_video_pwd"; |
290 const std::string current_data_ufrag = "current_data_ufrag"; | 290 const std::string current_data_ufrag = "current_data_ufrag"; |
291 const std::string current_data_pwd = "current_data_pwd"; | 291 const std::string current_data_pwd = "current_data_pwd"; |
292 rtc::scoped_ptr<SessionDescription> current_desc; | 292 rtc::scoped_ptr<SessionDescription> current_desc; |
293 rtc::scoped_ptr<SessionDescription> desc; | 293 rtc::scoped_ptr<SessionDescription> desc; |
294 if (has_current_desc) { | 294 if (has_current_desc) { |
295 current_desc.reset(new SessionDescription()); | 295 current_desc.reset(new SessionDescription()); |
296 EXPECT_TRUE(current_desc->AddTransportInfo( | 296 EXPECT_TRUE(current_desc->AddTransportInfo( |
297 TransportInfo("audio", | 297 TransportInfo("audio", |
298 TransportDescription(current_audio_ufrag, | 298 TransportDescription("", |
| 299 current_audio_ufrag, |
299 current_audio_pwd)))); | 300 current_audio_pwd)))); |
300 EXPECT_TRUE(current_desc->AddTransportInfo( | 301 EXPECT_TRUE(current_desc->AddTransportInfo( |
301 TransportInfo("video", | 302 TransportInfo("video", |
302 TransportDescription(current_video_ufrag, | 303 TransportDescription("", |
| 304 current_video_ufrag, |
303 current_video_pwd)))); | 305 current_video_pwd)))); |
304 EXPECT_TRUE(current_desc->AddTransportInfo( | 306 EXPECT_TRUE(current_desc->AddTransportInfo( |
305 TransportInfo("data", | 307 TransportInfo("data", |
306 TransportDescription(current_data_ufrag, | 308 TransportDescription("", |
| 309 current_data_ufrag, |
307 current_data_pwd)))); | 310 current_data_pwd)))); |
308 } | 311 } |
309 if (offer) { | 312 if (offer) { |
310 desc.reset(f1_.CreateOffer(options, current_desc.get())); | 313 desc.reset(f1_.CreateOffer(options, current_desc.get())); |
311 } else { | 314 } else { |
312 rtc::scoped_ptr<SessionDescription> offer; | 315 rtc::scoped_ptr<SessionDescription> offer; |
313 offer.reset(f1_.CreateOffer(options, NULL)); | 316 offer.reset(f1_.CreateOffer(options, NULL)); |
314 desc.reset(f1_.CreateAnswer(offer.get(), options, current_desc.get())); | 317 desc.reset(f1_.CreateAnswer(offer.get(), options, current_desc.get())); |
315 } | 318 } |
316 ASSERT_TRUE(desc.get() != NULL); | 319 ASSERT_TRUE(desc.get() != NULL); |
(...skipping 1989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2306 offer.reset(f1_.CreateOffer(options, NULL)); | 2309 offer.reset(f1_.CreateOffer(options, NULL)); |
2307 ASSERT_TRUE(offer.get() != NULL); | 2310 ASSERT_TRUE(offer.get() != NULL); |
2308 audio_content = offer->GetContentByName("audio"); | 2311 audio_content = offer->GetContentByName("audio"); |
2309 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); | 2312 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); |
2310 rtc::scoped_ptr<SessionDescription> answer( | 2313 rtc::scoped_ptr<SessionDescription> answer( |
2311 f1_.CreateAnswer(offer.get(), options, NULL)); | 2314 f1_.CreateAnswer(offer.get(), options, NULL)); |
2312 ASSERT_TRUE(answer.get() != NULL); | 2315 ASSERT_TRUE(answer.get() != NULL); |
2313 audio_content = answer->GetContentByName("audio"); | 2316 audio_content = answer->GetContentByName("audio"); |
2314 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); | 2317 EXPECT_TRUE(VerifyNoCNCodecs(audio_content)); |
2315 } | 2318 } |
OLD | NEW |