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 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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) { | 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); | 1188 ReceivesPliAndRecovers(0); |
1192 } | 1189 } |
1193 | 1190 |
1194 TEST_P(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) { | 1191 TEST_P(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) { |
1195 class PacketInputObserver : public PacketReceiver { | 1192 class PacketInputObserver : public PacketReceiver { |
1196 public: | 1193 public: |
1197 explicit PacketInputObserver(PacketReceiver* receiver) | 1194 explicit PacketInputObserver(PacketReceiver* receiver) |
1198 : receiver_(receiver), delivered_packet_(false, false) {} | 1195 : receiver_(receiver), delivered_packet_(false, false) {} |
1199 | 1196 |
1200 bool Wait() { return delivered_packet_.Wait(kDefaultTimeoutMs); } | 1197 bool Wait() { return delivered_packet_.Wait(kDefaultTimeoutMs); } |
(...skipping 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2980 std::map<std::string, bool> send_stats_filled_; | 2977 std::map<std::string, bool> send_stats_filled_; |
2981 | 2978 |
2982 std::vector<uint32_t> expected_receive_ssrcs_; | 2979 std::vector<uint32_t> expected_receive_ssrcs_; |
2983 std::set<uint32_t> expected_send_ssrcs_; | 2980 std::set<uint32_t> expected_send_ssrcs_; |
2984 std::string expected_cname_; | 2981 std::string expected_cname_; |
2985 | 2982 |
2986 rtc::Event check_stats_event_; | 2983 rtc::Event check_stats_event_; |
2987 ReceiveStreamRenderer receive_stream_renderer_; | 2984 ReceiveStreamRenderer receive_stream_renderer_; |
2988 } test; | 2985 } test; |
2989 | 2986 |
2990 // TODO(philipel): Implement statistics for the new video jitter buffer. | |
2991 if (GetParam() == new_jb_enabled) | |
2992 return; | |
2993 | |
2994 RunBaseTest(&test); | 2987 RunBaseTest(&test); |
2995 } | 2988 } |
2996 | 2989 |
2997 class RtcpXrObserver : public test::EndToEndTest { | 2990 class RtcpXrObserver : public test::EndToEndTest { |
2998 public: | 2991 public: |
2999 explicit RtcpXrObserver(bool enable_rrtr) | 2992 explicit RtcpXrObserver(bool enable_rrtr) |
3000 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), | 2993 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), |
3001 enable_rrtr_(enable_rrtr), | 2994 enable_rrtr_(enable_rrtr), |
3002 sent_rtcp_sr_(0), | 2995 sent_rtcp_sr_(0), |
3003 sent_rtcp_rr_(0), | 2996 sent_rtcp_rr_(0), |
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4065 std::unique_ptr<VideoEncoder> encoder_; | 4058 std::unique_ptr<VideoEncoder> encoder_; |
4066 std::unique_ptr<VideoDecoder> decoder_; | 4059 std::unique_ptr<VideoDecoder> decoder_; |
4067 rtc::CriticalSection crit_; | 4060 rtc::CriticalSection crit_; |
4068 int recorded_frames_ GUARDED_BY(crit_); | 4061 int recorded_frames_ GUARDED_BY(crit_); |
4069 } test(this); | 4062 } test(this); |
4070 | 4063 |
4071 RunBaseTest(&test); | 4064 RunBaseTest(&test); |
4072 } | 4065 } |
4073 | 4066 |
4074 } // namespace webrtc | 4067 } // namespace webrtc |
OLD | NEW |