| 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 984 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 995 bool received_pli_ GUARDED_BY(&crit_); | 995 bool received_pli_ GUARDED_BY(&crit_); |
| 996 } test(rtp_history_ms); | 996 } test(rtp_history_ms); |
| 997 | 997 |
| 998 RunBaseTest(&test, FakeNetworkPipe::Config()); | 998 RunBaseTest(&test, FakeNetworkPipe::Config()); |
| 999 } | 999 } |
| 1000 | 1000 |
| 1001 TEST_F(EndToEndTest, ReceivesPliAndRecoversWithNack) { | 1001 TEST_F(EndToEndTest, ReceivesPliAndRecoversWithNack) { |
| 1002 ReceivesPliAndRecovers(1000); | 1002 ReceivesPliAndRecovers(1000); |
| 1003 } | 1003 } |
| 1004 | 1004 |
| 1005 // TODO(pbos): Enable this when 2250 is resolved. | 1005 TEST_F(EndToEndTest, ReceivesPliAndRecoversWithoutNack) { |
| 1006 TEST_F(EndToEndTest, DISABLED_ReceivesPliAndRecoversWithoutNack) { | |
| 1007 ReceivesPliAndRecovers(0); | 1006 ReceivesPliAndRecovers(0); |
| 1008 } | 1007 } |
| 1009 | 1008 |
| 1010 TEST_F(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) { | 1009 TEST_F(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) { |
| 1011 class PacketInputObserver : public PacketReceiver { | 1010 class PacketInputObserver : public PacketReceiver { |
| 1012 public: | 1011 public: |
| 1013 explicit PacketInputObserver(PacketReceiver* receiver) | 1012 explicit PacketInputObserver(PacketReceiver* receiver) |
| 1014 : receiver_(receiver), delivered_packet_(EventWrapper::Create()) {} | 1013 : receiver_(receiver), delivered_packet_(EventWrapper::Create()) {} |
| 1015 | 1014 |
| 1016 EventTypeWrapper Wait() { | 1015 EventTypeWrapper Wait() { |
| (...skipping 2174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3191 EXPECT_TRUE(default_receive_config.rtp.rtx.empty()) | 3190 EXPECT_TRUE(default_receive_config.rtp.rtx.empty()) |
| 3192 << "Enabling RTX requires rtpmap: rtx negotiation."; | 3191 << "Enabling RTX requires rtpmap: rtx negotiation."; |
| 3193 EXPECT_TRUE(default_receive_config.rtp.extensions.empty()) | 3192 EXPECT_TRUE(default_receive_config.rtp.extensions.empty()) |
| 3194 << "Enabling RTP extensions require negotiation."; | 3193 << "Enabling RTP extensions require negotiation."; |
| 3195 | 3194 |
| 3196 VerifyEmptyNackConfig(default_receive_config.rtp.nack); | 3195 VerifyEmptyNackConfig(default_receive_config.rtp.nack); |
| 3197 VerifyEmptyFecConfig(default_receive_config.rtp.fec); | 3196 VerifyEmptyFecConfig(default_receive_config.rtp.fec); |
| 3198 } | 3197 } |
| 3199 | 3198 |
| 3200 } // namespace webrtc | 3199 } // namespace webrtc |
| OLD | NEW |