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

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

Issue 1211873004: Request keyframe if too many packets are missing and NACK is disabled. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated how to request keyframes Created 5 years, 3 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
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 959 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 bool received_pli_; 970 bool received_pli_;
971 } test(rtp_history_ms); 971 } test(rtp_history_ms);
972 972
973 RunBaseTest(&test); 973 RunBaseTest(&test);
974 } 974 }
975 975
976 TEST_F(EndToEndTest, ReceivesPliAndRecoversWithNack) { 976 TEST_F(EndToEndTest, ReceivesPliAndRecoversWithNack) {
977 ReceivesPliAndRecovers(1000); 977 ReceivesPliAndRecovers(1000);
978 } 978 }
979 979
980 // TODO(pbos): Enable this when 2250 is resolved. 980 TEST_F(EndToEndTest, ReceivesPliAndRecoversWithoutNack) {
981 TEST_F(EndToEndTest, DISABLED_ReceivesPliAndRecoversWithoutNack) {
982 ReceivesPliAndRecovers(0); 981 ReceivesPliAndRecovers(0);
983 } 982 }
984 983
985 TEST_F(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) { 984 TEST_F(EndToEndTest, UnknownRtpPacketGivesUnknownSsrcReturnCode) {
986 class PacketInputObserver : public PacketReceiver { 985 class PacketInputObserver : public PacketReceiver {
987 public: 986 public:
988 explicit PacketInputObserver(PacketReceiver* receiver) 987 explicit PacketInputObserver(PacketReceiver* receiver)
989 : receiver_(receiver), delivered_packet_(EventWrapper::Create()) {} 988 : receiver_(receiver), delivered_packet_(EventWrapper::Create()) {}
990 989
991 EventTypeWrapper Wait() { 990 EventTypeWrapper Wait() {
(...skipping 2048 matching lines...) Expand 10 before | Expand all | Expand 10 after
3040 EXPECT_TRUE(default_receive_config.rtp.rtx.empty()) 3039 EXPECT_TRUE(default_receive_config.rtp.rtx.empty())
3041 << "Enabling RTX requires rtpmap: rtx negotiation."; 3040 << "Enabling RTX requires rtpmap: rtx negotiation.";
3042 EXPECT_TRUE(default_receive_config.rtp.extensions.empty()) 3041 EXPECT_TRUE(default_receive_config.rtp.extensions.empty())
3043 << "Enabling RTP extensions require negotiation."; 3042 << "Enabling RTP extensions require negotiation.";
3044 3043
3045 VerifyEmptyNackConfig(default_receive_config.rtp.nack); 3044 VerifyEmptyNackConfig(default_receive_config.rtp.nack);
3046 VerifyEmptyFecConfig(default_receive_config.rtp.fec); 3045 VerifyEmptyFecConfig(default_receive_config.rtp.fec);
3047 } 3046 }
3048 3047
3049 } // namespace webrtc 3048 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698