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

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

Issue 2657823003: Disabled EndToEndTest.ReceivesFlexfecAndSendsCorrespondingRtcp on Asan (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 | « no previous file | no next file » | 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "webrtc/test/null_transport.h" 51 #include "webrtc/test/null_transport.h"
52 #include "webrtc/test/rtcp_packet_parser.h" 52 #include "webrtc/test/rtcp_packet_parser.h"
53 #include "webrtc/test/rtp_rtcp_observer.h" 53 #include "webrtc/test/rtp_rtcp_observer.h"
54 #include "webrtc/test/testsupport/fileutils.h" 54 #include "webrtc/test/testsupport/fileutils.h"
55 #include "webrtc/test/testsupport/perf_test.h" 55 #include "webrtc/test/testsupport/perf_test.h"
56 #include "webrtc/video/transport_adapter.h" 56 #include "webrtc/video/transport_adapter.h"
57 #include "webrtc/video_encoder.h" 57 #include "webrtc/video_encoder.h"
58 58
59 namespace webrtc { 59 namespace webrtc {
60 60
61 // Disable for Asan due to timeout, see bugs.webrtc.org/7047 for
62 // details.
63 #if defined(ADDRESS_SANITIZER)
64 #define MAYBE_ReceivesFlexfecAndSendsCorrespondingRtcp \
65 DISABLED_ReceivesFlexfecAndSendsCorrespondingRtcp
66 #else
67 #define MAYBE_ReceivesFlexfecAndSendsCorrespondingRtcp \
68 ReceivesFlexfecAndSendsCorrespondingRtcp
69 #endif
70
61 namespace { 71 namespace {
62 const char new_jb_enabled[] = "WebRTC-NewVideoJitterBuffer/Enabled/"; 72 const char new_jb_enabled[] = "WebRTC-NewVideoJitterBuffer/Enabled/";
63 const char new_jb_disabled[] = "WebRTC-NewVideoJitterBuffer/Disabled/"; 73 const char new_jb_disabled[] = "WebRTC-NewVideoJitterBuffer/Disabled/";
64 } // anonymous namespace 74 } // anonymous namespace
65 75
66 static const int kSilenceTimeoutMs = 2000; 76 static const int kSilenceTimeoutMs = 2000;
67 77
68 class EndToEndTest : public test::CallTest, 78 class EndToEndTest : public test::CallTest,
69 public ::testing::WithParamInterface<std::string> { 79 public ::testing::WithParamInterface<std::string> {
70 public: 80 public:
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 const bool expect_flexfec_rtcp_; 827 const bool expect_flexfec_rtcp_;
818 bool received_flexfec_rtcp_ GUARDED_BY(crit_); 828 bool received_flexfec_rtcp_ GUARDED_BY(crit_);
819 Random random_; 829 Random random_;
820 }; 830 };
821 831
822 TEST_P(EndToEndTest, ReceivesFlexfec) { 832 TEST_P(EndToEndTest, ReceivesFlexfec) {
823 FlexfecRenderObserver test(false); 833 FlexfecRenderObserver test(false);
824 RunBaseTest(&test); 834 RunBaseTest(&test);
825 } 835 }
826 836
827 TEST_P(EndToEndTest, ReceivesFlexfecAndSendsCorrespondingRtcp) { 837 TEST_P(EndToEndTest, MAYBE_ReceivesFlexfecAndSendsCorrespondingRtcp) {
828 FlexfecRenderObserver test(true); 838 FlexfecRenderObserver test(true);
829 RunBaseTest(&test); 839 RunBaseTest(&test);
830 } 840 }
831 841
832 TEST_P(EndToEndTest, ReceivedUlpfecPacketsNotNacked) { 842 TEST_P(EndToEndTest, ReceivedUlpfecPacketsNotNacked) {
833 class UlpfecNackObserver : public test::EndToEndTest { 843 class UlpfecNackObserver : public test::EndToEndTest {
834 public: 844 public:
835 UlpfecNackObserver() 845 UlpfecNackObserver()
836 : EndToEndTest(kDefaultTimeoutMs), 846 : EndToEndTest(kDefaultTimeoutMs),
837 state_(kFirstPacket), 847 state_(kFirstPacket),
(...skipping 3289 matching lines...) Expand 10 before | Expand all | Expand 10 after
4127 std::unique_ptr<VideoEncoder> encoder_; 4137 std::unique_ptr<VideoEncoder> encoder_;
4128 std::unique_ptr<VideoDecoder> decoder_; 4138 std::unique_ptr<VideoDecoder> decoder_;
4129 rtc::CriticalSection crit_; 4139 rtc::CriticalSection crit_;
4130 int recorded_frames_ GUARDED_BY(crit_); 4140 int recorded_frames_ GUARDED_BY(crit_);
4131 } test(this); 4141 } test(this);
4132 4142
4133 RunBaseTest(&test); 4143 RunBaseTest(&test);
4134 } 4144 }
4135 4145
4136 } // namespace webrtc 4146 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698