| Index: webrtc/video/video_send_stream_tests.cc
|
| diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
|
| index f48f7b7847f9a75191f0ce14823450d5bb57ba0f..14230e540b1e97040eeccbedf134a501f587dc96 100644
|
| --- a/webrtc/video/video_send_stream_tests.cc
|
| +++ b/webrtc/video/video_send_stream_tests.cc
|
| @@ -1652,7 +1652,18 @@ TEST_F(VideoSendStreamTest, TranslatesTwoLayerScreencastToTargetBitrate) {
|
| RunBaseTest(&test, FakeNetworkPipe::Config());
|
| }
|
|
|
| -TEST_F(VideoSendStreamTest, ReconfigureBitratesSetsEncoderBitratesCorrectly) {
|
| +// Disabled on LinuxAsan:
|
| +// https://bugs.chromium.org/p/webrtc/issues/detail?id=5382
|
| +#if defined(ADDRESS_SANITIZER) && defined(WEBRTC_LINUX)
|
| +#define MAYBE_ReconfigureBitratesSetsEncoderBitratesCorrectly \
|
| + DISABLED_ReconfigureBitratesSetsEncoderBitratesCorrectly
|
| +#else
|
| +#define MAYBE_ReconfigureBitratesSetsEncoderBitratesCorrectly \
|
| + ReconfigureBitratesSetsEncoderBitratesCorrectly
|
| +#endif
|
| +
|
| +TEST_F(VideoSendStreamTest,
|
| + MAYBE_ReconfigureBitratesSetsEncoderBitratesCorrectly) {
|
| // These are chosen to be "kind of odd" to not be accidentally checked against
|
| // default values.
|
| static const int kMinBitrateKbps = 137;
|
|
|