| 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 231   MediaSessionDescriptionFactoryTest() | 231   MediaSessionDescriptionFactoryTest() | 
| 232       : f1_(&tdf1_), | 232       : f1_(&tdf1_), | 
| 233         f2_(&tdf2_) { | 233         f2_(&tdf2_) { | 
| 234     f1_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs1)); | 234     f1_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs1)); | 
| 235     f1_.set_video_codecs(MAKE_VECTOR(kVideoCodecs1)); | 235     f1_.set_video_codecs(MAKE_VECTOR(kVideoCodecs1)); | 
| 236     f1_.set_data_codecs(MAKE_VECTOR(kDataCodecs1)); | 236     f1_.set_data_codecs(MAKE_VECTOR(kDataCodecs1)); | 
| 237     f2_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs2)); | 237     f2_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs2)); | 
| 238     f2_.set_video_codecs(MAKE_VECTOR(kVideoCodecs2)); | 238     f2_.set_video_codecs(MAKE_VECTOR(kVideoCodecs2)); | 
| 239     f2_.set_data_codecs(MAKE_VECTOR(kDataCodecs2)); | 239     f2_.set_data_codecs(MAKE_VECTOR(kDataCodecs2)); | 
| 240     tdf1_.set_certificate(rtc::RTCCertificate::Create( | 240     tdf1_.set_certificate(rtc::RTCCertificate::Create( | 
| 241         rtc::scoped_ptr<rtc::SSLIdentity>( | 241         rtc::scoped_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id1")))); | 
| 242             new rtc::FakeSSLIdentity("id1")).Pass())); |  | 
| 243     tdf2_.set_certificate(rtc::RTCCertificate::Create( | 242     tdf2_.set_certificate(rtc::RTCCertificate::Create( | 
| 244         rtc::scoped_ptr<rtc::SSLIdentity>( | 243         rtc::scoped_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id2")))); | 
| 245             new rtc::FakeSSLIdentity("id2")).Pass())); |  | 
| 246   } | 244   } | 
| 247 | 245 | 
| 248   // Create a video StreamParamsVec object with: | 246   // Create a video StreamParamsVec object with: | 
| 249   // - one video stream with 3 simulcast streams and FEC, | 247   // - one video stream with 3 simulcast streams and FEC, | 
| 250   StreamParamsVec CreateComplexVideoStreamParamsVec() { | 248   StreamParamsVec CreateComplexVideoStreamParamsVec() { | 
| 251     SsrcGroup sim_group("SIM", MAKE_VECTOR(kSimSsrc)); | 249     SsrcGroup sim_group("SIM", MAKE_VECTOR(kSimSsrc)); | 
| 252     SsrcGroup fec_group1("FEC", MAKE_VECTOR(kFec1Ssrc)); | 250     SsrcGroup fec_group1("FEC", MAKE_VECTOR(kFec1Ssrc)); | 
| 253     SsrcGroup fec_group2("FEC", MAKE_VECTOR(kFec2Ssrc)); | 251     SsrcGroup fec_group2("FEC", MAKE_VECTOR(kFec2Ssrc)); | 
| 254     SsrcGroup fec_group3("FEC", MAKE_VECTOR(kFec3Ssrc)); | 252     SsrcGroup fec_group3("FEC", MAKE_VECTOR(kFec3Ssrc)); | 
| 255 | 253 | 
| (...skipping 2081 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2337   const ContentInfo* audio_content = GetFirstAudioContent(updated_offer.get()); | 2335   const ContentInfo* audio_content = GetFirstAudioContent(updated_offer.get()); | 
| 2338   const ContentInfo* video_content = GetFirstVideoContent(updated_offer.get()); | 2336   const ContentInfo* video_content = GetFirstVideoContent(updated_offer.get()); | 
| 2339   const ContentInfo* data_content = GetFirstDataContent(updated_offer.get()); | 2337   const ContentInfo* data_content = GetFirstDataContent(updated_offer.get()); | 
| 2340   ASSERT_TRUE(audio_content != nullptr); | 2338   ASSERT_TRUE(audio_content != nullptr); | 
| 2341   ASSERT_TRUE(video_content != nullptr); | 2339   ASSERT_TRUE(video_content != nullptr); | 
| 2342   ASSERT_TRUE(data_content != nullptr); | 2340   ASSERT_TRUE(data_content != nullptr); | 
| 2343   EXPECT_EQ("audio_modified", audio_content->name); | 2341   EXPECT_EQ("audio_modified", audio_content->name); | 
| 2344   EXPECT_EQ("video_modified", video_content->name); | 2342   EXPECT_EQ("video_modified", video_content->name); | 
| 2345   EXPECT_EQ("data_modified", data_content->name); | 2343   EXPECT_EQ("data_modified", data_content->name); | 
| 2346 } | 2344 } | 
| OLD | NEW | 
|---|