OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 MediaSessionDescriptionFactoryTest() | 205 MediaSessionDescriptionFactoryTest() |
206 : f1_(&tdf1_), | 206 : f1_(&tdf1_), |
207 f2_(&tdf2_) { | 207 f2_(&tdf2_) { |
208 f1_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs1)); | 208 f1_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs1)); |
209 f1_.set_video_codecs(MAKE_VECTOR(kVideoCodecs1)); | 209 f1_.set_video_codecs(MAKE_VECTOR(kVideoCodecs1)); |
210 f1_.set_data_codecs(MAKE_VECTOR(kDataCodecs1)); | 210 f1_.set_data_codecs(MAKE_VECTOR(kDataCodecs1)); |
211 f2_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs2)); | 211 f2_.set_audio_codecs(MAKE_VECTOR(kAudioCodecs2)); |
212 f2_.set_video_codecs(MAKE_VECTOR(kVideoCodecs2)); | 212 f2_.set_video_codecs(MAKE_VECTOR(kVideoCodecs2)); |
213 f2_.set_data_codecs(MAKE_VECTOR(kDataCodecs2)); | 213 f2_.set_data_codecs(MAKE_VECTOR(kDataCodecs2)); |
214 tdf1_.set_certificate(rtc::RTCCertificate::Create( | 214 tdf1_.set_certificate(rtc::RTCCertificate::Create( |
215 rtc::scoped_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id1")))); | 215 std::unique_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id1")))); |
216 tdf2_.set_certificate(rtc::RTCCertificate::Create( | 216 tdf2_.set_certificate(rtc::RTCCertificate::Create( |
217 rtc::scoped_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id2")))); | 217 std::unique_ptr<rtc::SSLIdentity>(new rtc::FakeSSLIdentity("id2")))); |
218 } | 218 } |
219 | 219 |
220 // Create a video StreamParamsVec object with: | 220 // Create a video StreamParamsVec object with: |
221 // - one video stream with 3 simulcast streams and FEC, | 221 // - one video stream with 3 simulcast streams and FEC, |
222 StreamParamsVec CreateComplexVideoStreamParamsVec() { | 222 StreamParamsVec CreateComplexVideoStreamParamsVec() { |
223 SsrcGroup sim_group("SIM", MAKE_VECTOR(kSimSsrc)); | 223 SsrcGroup sim_group("SIM", MAKE_VECTOR(kSimSsrc)); |
224 SsrcGroup fec_group1("FEC", MAKE_VECTOR(kFec1Ssrc)); | 224 SsrcGroup fec_group1("FEC", MAKE_VECTOR(kFec1Ssrc)); |
225 SsrcGroup fec_group2("FEC", MAKE_VECTOR(kFec2Ssrc)); | 225 SsrcGroup fec_group2("FEC", MAKE_VECTOR(kFec2Ssrc)); |
226 SsrcGroup fec_group3("FEC", MAKE_VECTOR(kFec3Ssrc)); | 226 SsrcGroup fec_group3("FEC", MAKE_VECTOR(kFec3Ssrc)); |
227 | 227 |
(...skipping 2144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2372 const ContentInfo* audio_content = GetFirstAudioContent(updated_offer.get()); | 2372 const ContentInfo* audio_content = GetFirstAudioContent(updated_offer.get()); |
2373 const ContentInfo* video_content = GetFirstVideoContent(updated_offer.get()); | 2373 const ContentInfo* video_content = GetFirstVideoContent(updated_offer.get()); |
2374 const ContentInfo* data_content = GetFirstDataContent(updated_offer.get()); | 2374 const ContentInfo* data_content = GetFirstDataContent(updated_offer.get()); |
2375 ASSERT_TRUE(audio_content != nullptr); | 2375 ASSERT_TRUE(audio_content != nullptr); |
2376 ASSERT_TRUE(video_content != nullptr); | 2376 ASSERT_TRUE(video_content != nullptr); |
2377 ASSERT_TRUE(data_content != nullptr); | 2377 ASSERT_TRUE(data_content != nullptr); |
2378 EXPECT_EQ("audio_modified", audio_content->name); | 2378 EXPECT_EQ("audio_modified", audio_content->name); |
2379 EXPECT_EQ("video_modified", video_content->name); | 2379 EXPECT_EQ("video_modified", video_content->name); |
2380 EXPECT_EQ("data_modified", data_content->name); | 2380 EXPECT_EQ("data_modified", data_content->name); |
2381 } | 2381 } |
OLD | NEW |