| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 3062 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3073 receive_transport.StopSending(); | 3073 receive_transport.StopSending(); |
| 3074 | 3074 |
| 3075 Stop(); | 3075 Stop(); |
| 3076 DestroyStreams(); | 3076 DestroyStreams(); |
| 3077 } | 3077 } |
| 3078 | 3078 |
| 3079 TEST_F(EndToEndTest, RestartingSendStreamPreservesRtpState) { | 3079 TEST_F(EndToEndTest, RestartingSendStreamPreservesRtpState) { |
| 3080 TestRtpStatePreservation(false); | 3080 TestRtpStatePreservation(false); |
| 3081 } | 3081 } |
| 3082 | 3082 |
| 3083 TEST_F(EndToEndTest, RestartingSendStreamPreservesRtpStatesWithRtx) { | 3083 #if defined(WEBRTC_MAC) |
| 3084 #define MAYBE_RestartingSendStreamPreservesRtpStatesWithRtx \ |
| 3085 DISABLED_RestartingSendStreamPreservesRtpStatesWithRtx |
| 3086 #else |
| 3087 #define MAYBE_RestartingSendStreamPreservesRtpStatesWithRtx \ |
| 3088 RestartingSendStreamPreservesRtpStatesWithRtx |
| 3089 #endif |
| 3090 TEST_F(EndToEndTest, MAYBE_RestartingSendStreamPreservesRtpStatesWithRtx) { |
| 3084 TestRtpStatePreservation(true); | 3091 TestRtpStatePreservation(true); |
| 3085 } | 3092 } |
| 3086 | 3093 |
| 3087 TEST_F(EndToEndTest, RespectsNetworkState) { | 3094 TEST_F(EndToEndTest, RespectsNetworkState) { |
| 3088 // TODO(pbos): Remove accepted downtime packets etc. when signaling network | 3095 // TODO(pbos): Remove accepted downtime packets etc. when signaling network |
| 3089 // down blocks until no more packets will be sent. | 3096 // down blocks until no more packets will be sent. |
| 3090 | 3097 |
| 3091 // Pacer will send from its packet list and then send required padding before | 3098 // Pacer will send from its packet list and then send required padding before |
| 3092 // checking paused_ again. This should be enough for one round of pacing, | 3099 // checking paused_ again. This should be enough for one round of pacing, |
| 3093 // otherwise increase. | 3100 // otherwise increase. |
| (...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3539 private: | 3546 private: |
| 3540 bool video_observed_; | 3547 bool video_observed_; |
| 3541 bool audio_observed_; | 3548 bool audio_observed_; |
| 3542 SequenceNumberUnwrapper unwrapper_; | 3549 SequenceNumberUnwrapper unwrapper_; |
| 3543 std::set<int64_t> received_packet_ids_; | 3550 std::set<int64_t> received_packet_ids_; |
| 3544 } test; | 3551 } test; |
| 3545 | 3552 |
| 3546 RunBaseTest(&test); | 3553 RunBaseTest(&test); |
| 3547 } | 3554 } |
| 3548 } // namespace webrtc | 3555 } // namespace webrtc |
| OLD | NEW |