| 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 4127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4138 #define MAYBE_PictureIdStateRetainedAfterReinitingVp8 \ | 4138 #define MAYBE_PictureIdStateRetainedAfterReinitingVp8 \ |
| 4139 PictureIdStateRetainedAfterReinitingVp8 | 4139 PictureIdStateRetainedAfterReinitingVp8 |
| 4140 #define MAYBE_PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter \ | 4140 #define MAYBE_PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter \ |
| 4141 PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter | 4141 PictureIdStateRetainedAfterReinitingSimulcastEncoderAdapter |
| 4142 #endif | 4142 #endif |
| 4143 TEST_F(EndToEndTest, MAYBE_PictureIdStateRetainedAfterReinitingVp8) { | 4143 TEST_F(EndToEndTest, MAYBE_PictureIdStateRetainedAfterReinitingVp8) { |
| 4144 std::unique_ptr<VideoEncoder> encoder(VP8Encoder::Create()); | 4144 std::unique_ptr<VideoEncoder> encoder(VP8Encoder::Create()); |
| 4145 TestPictureIdStatePreservation(encoder.get()); | 4145 TestPictureIdStatePreservation(encoder.get()); |
| 4146 } | 4146 } |
| 4147 | 4147 |
| 4148 TEST_F(EndToEndTest, TestFlexfecRtpStatePreservation) { | 4148 // This test is flaky on linux_memcheck. Disable on all linux bots until |
| 4149 // flakyness has been fixed. |
| 4150 // https://bugs.chromium.org/p/webrtc/issues/detail?id=7737 |
| 4151 #if defined(WEBRTC_LINUX) |
| 4152 #define MAYBE_TestFlexfecRtpStatePreservation \ |
| 4153 DISABLED_TestFlexfecRtpStatePreservation |
| 4154 #else |
| 4155 #define MAYBE_TestFlexfecRtpStatePreservation TestFlexfecRtpStatePreservation |
| 4156 #endif |
| 4157 TEST_F(EndToEndTest, MAYBE_TestFlexfecRtpStatePreservation) { |
| 4149 class RtpSequenceObserver : public test::RtpRtcpObserver { | 4158 class RtpSequenceObserver : public test::RtpRtcpObserver { |
| 4150 public: | 4159 public: |
| 4151 RtpSequenceObserver() | 4160 RtpSequenceObserver() |
| 4152 : test::RtpRtcpObserver(kDefaultTimeoutMs), | 4161 : test::RtpRtcpObserver(kDefaultTimeoutMs), |
| 4153 num_flexfec_packets_sent_(0) {} | 4162 num_flexfec_packets_sent_(0) {} |
| 4154 | 4163 |
| 4155 void ResetPacketCount() { | 4164 void ResetPacketCount() { |
| 4156 rtc::CritScope lock(&crit_); | 4165 rtc::CritScope lock(&crit_); |
| 4157 num_flexfec_packets_sent_ = 0; | 4166 num_flexfec_packets_sent_ = 0; |
| 4158 } | 4167 } |
| (...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4918 std::unique_ptr<VideoEncoder> encoder_; | 4927 std::unique_ptr<VideoEncoder> encoder_; |
| 4919 std::unique_ptr<VideoDecoder> decoder_; | 4928 std::unique_ptr<VideoDecoder> decoder_; |
| 4920 rtc::CriticalSection crit_; | 4929 rtc::CriticalSection crit_; |
| 4921 int recorded_frames_ GUARDED_BY(crit_); | 4930 int recorded_frames_ GUARDED_BY(crit_); |
| 4922 } test(this); | 4931 } test(this); |
| 4923 | 4932 |
| 4924 RunBaseTest(&test); | 4933 RunBaseTest(&test); |
| 4925 } | 4934 } |
| 4926 | 4935 |
| 4927 } // namespace webrtc | 4936 } // namespace webrtc |
| OLD | NEW |