Chromium Code Reviews| 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 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1177 bool received_pli_ GUARDED_BY(&crit_); | 1177 bool received_pli_ GUARDED_BY(&crit_); |
| 1178 } test(rtp_history_ms); | 1178 } test(rtp_history_ms); |
| 1179 | 1179 |
| 1180 RunBaseTest(&test); | 1180 RunBaseTest(&test); |
| 1181 } | 1181 } |
| 1182 | 1182 |
| 1183 TEST_P(EndToEndTest, ReceivesPliAndRecoversWithNack) { | 1183 TEST_P(EndToEndTest, ReceivesPliAndRecoversWithNack) { |
| 1184 ReceivesPliAndRecovers(1000); | 1184 ReceivesPliAndRecovers(1000); |
| 1185 } | 1185 } |
| 1186 | 1186 |
| 1187 TEST_P(EndToEndTest, ReceivesPliAndRecoversWithoutNack) { | |
| 1188 // This test makes no sense for the new video jitter buffer. | |
| 1189 if (GetParam() == new_jb_enabled) | |
| 1190 return; | |
| 1191 ReceivesPliAndRecovers(0); | |
| 1192 } | |
| 1193 | |
|
stefan-webrtc
2017/01/12 14:16:15
As mentioned offline, I'm not sure we want to dele
philipel
2017/01/12 16:41:35
Fixed the NackModule to not send NACKs when histor
| |
| 1194 TEST_P(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) { | 1187 TEST_P(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) { |
| 1195 class PacketInputObserver : public PacketReceiver { | 1188 class PacketInputObserver : public PacketReceiver { |
| 1196 public: | 1189 public: |
| 1197 explicit PacketInputObserver(PacketReceiver* receiver) | 1190 explicit PacketInputObserver(PacketReceiver* receiver) |
| 1198 : receiver_(receiver), delivered_packet_(false, false) {} | 1191 : receiver_(receiver), delivered_packet_(false, false) {} |
| 1199 | 1192 |
| 1200 bool Wait() { return delivered_packet_.Wait(kDefaultTimeoutMs); } | 1193 bool Wait() { return delivered_packet_.Wait(kDefaultTimeoutMs); } |
| 1201 | 1194 |
| 1202 private: | 1195 private: |
| 1203 DeliveryStatus DeliverPacket(MediaType media_type, | 1196 DeliveryStatus DeliverPacket(MediaType media_type, |
| (...skipping 1776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2980 std::map<std::string, bool> send_stats_filled_; | 2973 std::map<std::string, bool> send_stats_filled_; |
| 2981 | 2974 |
| 2982 std::vector<uint32_t> expected_receive_ssrcs_; | 2975 std::vector<uint32_t> expected_receive_ssrcs_; |
| 2983 std::set<uint32_t> expected_send_ssrcs_; | 2976 std::set<uint32_t> expected_send_ssrcs_; |
| 2984 std::string expected_cname_; | 2977 std::string expected_cname_; |
| 2985 | 2978 |
| 2986 rtc::Event check_stats_event_; | 2979 rtc::Event check_stats_event_; |
| 2987 ReceiveStreamRenderer receive_stream_renderer_; | 2980 ReceiveStreamRenderer receive_stream_renderer_; |
| 2988 } test; | 2981 } test; |
| 2989 | 2982 |
| 2990 // TODO(philipel): Implement statistics for the new video jitter buffer. | |
| 2991 if (GetParam() == new_jb_enabled) | |
| 2992 return; | |
| 2993 | |
| 2994 RunBaseTest(&test); | 2983 RunBaseTest(&test); |
| 2995 } | 2984 } |
| 2996 | 2985 |
| 2997 class RtcpXrObserver : public test::EndToEndTest { | 2986 class RtcpXrObserver : public test::EndToEndTest { |
| 2998 public: | 2987 public: |
| 2999 explicit RtcpXrObserver(bool enable_rrtr) | 2988 explicit RtcpXrObserver(bool enable_rrtr) |
| 3000 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), | 2989 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), |
| 3001 enable_rrtr_(enable_rrtr), | 2990 enable_rrtr_(enable_rrtr), |
| 3002 sent_rtcp_sr_(0), | 2991 sent_rtcp_sr_(0), |
| 3003 sent_rtcp_rr_(0), | 2992 sent_rtcp_rr_(0), |
| (...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4065 std::unique_ptr<VideoEncoder> encoder_; | 4054 std::unique_ptr<VideoEncoder> encoder_; |
| 4066 std::unique_ptr<VideoDecoder> decoder_; | 4055 std::unique_ptr<VideoDecoder> decoder_; |
| 4067 rtc::CriticalSection crit_; | 4056 rtc::CriticalSection crit_; |
| 4068 int recorded_frames_ GUARDED_BY(crit_); | 4057 int recorded_frames_ GUARDED_BY(crit_); |
| 4069 } test(this); | 4058 } test(this); |
| 4070 | 4059 |
| 4071 RunBaseTest(&test); | 4060 RunBaseTest(&test); |
| 4072 } | 4061 } |
| 4073 | 4062 |
| 4074 } // namespace webrtc | 4063 } // namespace webrtc |
| OLD | NEW |