Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Side by Side Diff: webrtc/video/end_to_end_tests.cc

Issue 2632123005: Revert of Make the new jitter buffer the default jitter buffer. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/modules/video_coding/video_receiver.cc ('k') | webrtc/video/receive_statistics_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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;
1188 ReceivesPliAndRecovers(0); 1191 ReceivesPliAndRecovers(0);
1189 } 1192 }
1190 1193
1191 TEST_P(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) { 1194 TEST_P(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) {
1192 class PacketInputObserver : public PacketReceiver { 1195 class PacketInputObserver : public PacketReceiver {
1193 public: 1196 public:
1194 explicit PacketInputObserver(PacketReceiver* receiver) 1197 explicit PacketInputObserver(PacketReceiver* receiver)
1195 : receiver_(receiver), delivered_packet_(false, false) {} 1198 : receiver_(receiver), delivered_packet_(false, false) {}
1196 1199
1197 bool Wait() { return delivered_packet_.Wait(kDefaultTimeoutMs); } 1200 bool Wait() { return delivered_packet_.Wait(kDefaultTimeoutMs); }
(...skipping 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after
2977 std::map<std::string, bool> send_stats_filled_; 2980 std::map<std::string, bool> send_stats_filled_;
2978 2981
2979 std::vector<uint32_t> expected_receive_ssrcs_; 2982 std::vector<uint32_t> expected_receive_ssrcs_;
2980 std::set<uint32_t> expected_send_ssrcs_; 2983 std::set<uint32_t> expected_send_ssrcs_;
2981 std::string expected_cname_; 2984 std::string expected_cname_;
2982 2985
2983 rtc::Event check_stats_event_; 2986 rtc::Event check_stats_event_;
2984 ReceiveStreamRenderer receive_stream_renderer_; 2987 ReceiveStreamRenderer receive_stream_renderer_;
2985 } test; 2988 } test;
2986 2989
2990 // TODO(philipel): Implement statistics for the new video jitter buffer.
2991 if (GetParam() == new_jb_enabled)
2992 return;
2993
2987 RunBaseTest(&test); 2994 RunBaseTest(&test);
2988 } 2995 }
2989 2996
2990 class RtcpXrObserver : public test::EndToEndTest { 2997 class RtcpXrObserver : public test::EndToEndTest {
2991 public: 2998 public:
2992 explicit RtcpXrObserver(bool enable_rrtr) 2999 explicit RtcpXrObserver(bool enable_rrtr)
2993 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), 3000 : EndToEndTest(test::CallTest::kDefaultTimeoutMs),
2994 enable_rrtr_(enable_rrtr), 3001 enable_rrtr_(enable_rrtr),
2995 sent_rtcp_sr_(0), 3002 sent_rtcp_sr_(0),
2996 sent_rtcp_rr_(0), 3003 sent_rtcp_rr_(0),
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
4058 std::unique_ptr<VideoEncoder> encoder_; 4065 std::unique_ptr<VideoEncoder> encoder_;
4059 std::unique_ptr<VideoDecoder> decoder_; 4066 std::unique_ptr<VideoDecoder> decoder_;
4060 rtc::CriticalSection crit_; 4067 rtc::CriticalSection crit_;
4061 int recorded_frames_ GUARDED_BY(crit_); 4068 int recorded_frames_ GUARDED_BY(crit_);
4062 } test(this); 4069 } test(this);
4063 4070
4064 RunBaseTest(&test); 4071 RunBaseTest(&test);
4065 } 4072 }
4066 4073
4067 } // namespace webrtc 4074 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/video_receiver.cc ('k') | webrtc/video/receive_statistics_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698