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

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

Issue 2652043005: Reland of Make the new jitter buffer the default jitter buffer. (Closed)
Patch Set: Rebase Created 3 years, 10 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 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 } test(rtp_history_ms); 1227 } test(rtp_history_ms);
1228 1228
1229 RunBaseTest(&test); 1229 RunBaseTest(&test);
1230 } 1230 }
1231 1231
1232 TEST_P(EndToEndTest, ReceivesPliAndRecoversWithNack) { 1232 TEST_P(EndToEndTest, ReceivesPliAndRecoversWithNack) {
1233 ReceivesPliAndRecovers(1000); 1233 ReceivesPliAndRecovers(1000);
1234 } 1234 }
1235 1235
1236 TEST_P(EndToEndTest, ReceivesPliAndRecoversWithoutNack) { 1236 TEST_P(EndToEndTest, ReceivesPliAndRecoversWithoutNack) {
1237 // This test makes no sense for the new video jitter buffer.
1238 if (GetParam() == new_jb_enabled)
1239 return;
1240 ReceivesPliAndRecovers(0); 1237 ReceivesPliAndRecovers(0);
1241 } 1238 }
1242 1239
1243 TEST_P(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) { 1240 TEST_P(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) {
1244 class PacketInputObserver : public PacketReceiver { 1241 class PacketInputObserver : public PacketReceiver {
1245 public: 1242 public:
1246 explicit PacketInputObserver(PacketReceiver* receiver) 1243 explicit PacketInputObserver(PacketReceiver* receiver)
1247 : receiver_(receiver), delivered_packet_(false, false) {} 1244 : receiver_(receiver), delivered_packet_(false, false) {}
1248 1245
1249 bool Wait() { return delivered_packet_.Wait(kDefaultTimeoutMs); } 1246 bool Wait() { return delivered_packet_.Wait(kDefaultTimeoutMs); }
(...skipping 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after
3029 std::map<std::string, bool> send_stats_filled_; 3026 std::map<std::string, bool> send_stats_filled_;
3030 3027
3031 std::vector<uint32_t> expected_receive_ssrcs_; 3028 std::vector<uint32_t> expected_receive_ssrcs_;
3032 std::set<uint32_t> expected_send_ssrcs_; 3029 std::set<uint32_t> expected_send_ssrcs_;
3033 std::string expected_cname_; 3030 std::string expected_cname_;
3034 3031
3035 rtc::Event check_stats_event_; 3032 rtc::Event check_stats_event_;
3036 ReceiveStreamRenderer receive_stream_renderer_; 3033 ReceiveStreamRenderer receive_stream_renderer_;
3037 } test; 3034 } test;
3038 3035
3039 // TODO(philipel): Implement statistics for the new video jitter buffer.
3040 if (GetParam() == new_jb_enabled)
3041 return;
3042
3043 RunBaseTest(&test); 3036 RunBaseTest(&test);
3044 } 3037 }
3045 3038
3046 class RtcpXrObserver : public test::EndToEndTest { 3039 class RtcpXrObserver : public test::EndToEndTest {
3047 public: 3040 public:
3048 RtcpXrObserver(bool enable_rrtr, bool enable_target_bitrate) 3041 RtcpXrObserver(bool enable_rrtr, bool enable_target_bitrate)
3049 : EndToEndTest(test::CallTest::kDefaultTimeoutMs), 3042 : EndToEndTest(test::CallTest::kDefaultTimeoutMs),
3050 enable_rrtr_(enable_rrtr), 3043 enable_rrtr_(enable_rrtr),
3051 enable_target_bitrate_(enable_target_bitrate), 3044 enable_target_bitrate_(enable_target_bitrate),
3052 sent_rtcp_sr_(0), 3045 sent_rtcp_sr_(0),
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
4133 std::unique_ptr<VideoEncoder> encoder_; 4126 std::unique_ptr<VideoEncoder> encoder_;
4134 std::unique_ptr<VideoDecoder> decoder_; 4127 std::unique_ptr<VideoDecoder> decoder_;
4135 rtc::CriticalSection crit_; 4128 rtc::CriticalSection crit_;
4136 int recorded_frames_ GUARDED_BY(crit_); 4129 int recorded_frames_ GUARDED_BY(crit_);
4137 } test(this); 4130 } test(this);
4138 4131
4139 RunBaseTest(&test); 4132 RunBaseTest(&test);
4140 } 4133 }
4141 4134
4142 } // namespace webrtc 4135 } // 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