| 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 4172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4183 cricket::Candidate candidate1; | 4183 cricket::Candidate candidate1; |
| 4184 candidate1.set_address(rtc::SocketAddress("1.1.1.1", 5000)); | 4184 candidate1.set_address(rtc::SocketAddress("1.1.1.1", 5000)); |
| 4185 candidate1.set_component(1); | 4185 candidate1.set_component(1); |
| 4186 JsepIceCandidate ice_candidate(kMediaContentName1, kMediaContentIndex1, | 4186 JsepIceCandidate ice_candidate(kMediaContentName1, kMediaContentIndex1, |
| 4187 candidate1); | 4187 candidate1); |
| 4188 EXPECT_TRUE(session_->ProcessIceMessage(&ice_candidate)); | 4188 EXPECT_TRUE(session_->ProcessIceMessage(&ice_candidate)); |
| 4189 | 4189 |
| 4190 answer = CreateAnswer(NULL); | 4190 answer = CreateAnswer(NULL); |
| 4191 SetLocalDescriptionWithoutError(answer); | 4191 SetLocalDescriptionWithoutError(answer); |
| 4192 } | 4192 } |
| 4193 |
| 4194 // Flaky on Win and Mac only. See webrtc:4943 |
| 4195 #if defined(WEBRTC_WIN) || defined(WEBRTC_MAC) |
| 4196 #define MAYBE_TestRtxRemovedByCreateAnswer DISABLED_TestRtxRemovedByCreateAnswer |
| 4197 #else |
| 4198 #define MAYBE_TestRtxRemovedByCreateAnswer TestRtxRemovedByCreateAnswer |
| 4199 #endif |
| 4193 // Tests that RTX codec is removed from the answer when it isn't supported | 4200 // Tests that RTX codec is removed from the answer when it isn't supported |
| 4194 // by local side. | 4201 // by local side. |
| 4195 TEST_F(WebRtcSessionTest, TestRtxRemovedByCreateAnswer) { | 4202 TEST_F(WebRtcSessionTest, MAYBE_TestRtxRemovedByCreateAnswer) { |
| 4196 Init(); | 4203 Init(); |
| 4197 SendAudioVideoStream1(); | 4204 SendAudioVideoStream1(); |
| 4198 std::string offer_sdp(kSdpWithRtx); | 4205 std::string offer_sdp(kSdpWithRtx); |
| 4199 | 4206 |
| 4200 SessionDescriptionInterface* offer = | 4207 SessionDescriptionInterface* offer = |
| 4201 CreateSessionDescription(JsepSessionDescription::kOffer, offer_sdp, NULL); | 4208 CreateSessionDescription(JsepSessionDescription::kOffer, offer_sdp, NULL); |
| 4202 EXPECT_TRUE(offer->ToString(&offer_sdp)); | 4209 EXPECT_TRUE(offer->ToString(&offer_sdp)); |
| 4203 | 4210 |
| 4204 // Offer SDP contains the RTX codec. | 4211 // Offer SDP contains the RTX codec. |
| 4205 EXPECT_TRUE(offer_sdp.find("rtx") != std::string::npos); | 4212 EXPECT_TRUE(offer_sdp.find("rtx") != std::string::npos); |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4303 } | 4310 } |
| 4304 | 4311 |
| 4305 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4312 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
| 4306 // currently fails because upon disconnection and reconnection OnIceComplete is | 4313 // currently fails because upon disconnection and reconnection OnIceComplete is |
| 4307 // called more than once without returning to IceGatheringGathering. | 4314 // called more than once without returning to IceGatheringGathering. |
| 4308 | 4315 |
| 4309 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4316 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
| 4310 WebRtcSessionTest, | 4317 WebRtcSessionTest, |
| 4311 testing::Values(ALREADY_GENERATED, | 4318 testing::Values(ALREADY_GENERATED, |
| 4312 DTLS_IDENTITY_STORE)); | 4319 DTLS_IDENTITY_STORE)); |
| OLD | NEW |