From c3e1cabc696240e4b5a128653264785292878205 Mon Sep 17 00:00:00 2001 From: "henrik.lundin" Date: Mon, 19 Dec 2016 02:03:33 -0800 Subject: [PATCH] Revert of Re-enable Opus complexity tests on Android (patchset #1 id:1 of https://codereview.webrtc.org/2589673002/ ) Reason for revert: This fails on perf bots. See for instance https://uberchromegw.corp.google.com/i/client.webrtc.perf/builders/Android32%20Tests%20%28K%20Nexus5%29/builds/105/steps/webrtc_perf_tests/logs/stdio: I 643.319s run_tests_on_device(03832b22f0e944a0) Note: Google Test filter = AudioEncoderOpusComplexityAdaptationTest.AdaptationOff I 643.319s run_tests_on_device(03832b22f0e944a0) [==========] Running 1 test from 1 test case. I 643.319s run_tests_on_device(03832b22f0e944a0) [----------] Global test environment set-up. I 643.319s run_tests_on_device(03832b22f0e944a0) [----------] 1 test from AudioEncoderOpusComplexityAdaptationTest I 643.319s run_tests_on_device(03832b22f0e944a0) [ RUN ] AudioEncoderOpusComplexityAdaptationTest.AdaptationOff I 643.319s run_tests_on_device(03832b22f0e944a0) ../../webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc:36: Failure I 643.319s run_tests_on_device(03832b22f0e944a0) Value of: audio_loop.Init(kInputFileName, kMaxLoopLengthSamples, kInputBlockSizeSamples) I 643.320s run_tests_on_device(03832b22f0e944a0) Actual: false I 643.320s run_tests_on_device(03832b22f0e944a0) Expected: true I 643.320s run_tests_on_device(03832b22f0e944a0) [ CRASHED ] I 643.405s run_tests_on_device(0384888cf0e945d1) >>ScopedMainEntryLogger I 643.405s run_tests_on_device(0384888cf0e945d1) Note: Google Test filter = AudioEncoderOpusComplexityAdaptationTest.AdaptationOn I 643.405s run_tests_on_device(0384888cf0e945d1) [==========] Running 1 test from 1 test case. I 643.405s run_tests_on_device(0384888cf0e945d1) [----------] Global test environment set-up. I 643.405s run_tests_on_device(0384888cf0e945d1) [----------] 1 test from AudioEncoderOpusComplexityAdaptationTest I 643.405s run_tests_on_device(0384888cf0e945d1) [ RUN ] AudioEncoderOpusComplexityAdaptationTest.AdaptationOn I 643.405s run_tests_on_device(0384888cf0e945d1) ../../webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc:36: Failure I 643.405s run_tests_on_device(0384888cf0e945d1) Value of: audio_loop.Init(kInputFileName, kMaxLoopLengthSamples, kInputBlockSizeSamples) I 643.405s run_tests_on_device(0384888cf0e945d1) Actual: false I 643.405s run_tests_on_device(0384888cf0e945d1) Expected: true I 643.405s run_tests_on_device(0384888cf0e945d1) [ CRASHED ] Original issue's description: > Re-enable Opus complexity tests on Android > > BUG=webrtc:6708 > TBR=minyue@webrtc.org > > Review-Url: https://codereview.webrtc.org/2589673002 > Cr-Commit-Position: refs/heads/master@{#15667} > Committed: https://chromium.googlesource.com/external/webrtc/+/14479ddfd49f64e2a996d363220ab268dfb20c6e TBR= # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6708 Review-Url: https://codereview.webrtc.org/2589703002 Cr-Commit-Position: refs/heads/master@{#15668} --- .../codecs/opus/opus_complexity_unittest.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc b/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc index 83a4539d0c..5339cffdfc 100644 --- a/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc +++ b/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc @@ -49,6 +49,14 @@ int64_t RunComplexityTest(const AudioEncoderOpus::Config& config) { } } // namespace +#if defined(WEBRTC_ANDROID) +#define MAYBE_AudioEncoderOpusComplexityAdaptationTest \ + DISABLED_AudioEncoderOpusComplexityAdaptationTest +#else +#define MAYBE_AudioEncoderOpusComplexityAdaptationTest \ + AudioEncoderOpusComplexityAdaptationTest +#endif + // This test encodes an audio file using Opus twice with different bitrates // (12.5 kbps and 15.5 kbps). The runtime for each is measured, and the ratio // between the two is calculated and tracked. This test explicitly sets the @@ -59,7 +67,7 @@ int64_t RunComplexityTest(const AudioEncoderOpus::Config& config) { // mobiles, the regular complexity is 5, and we expect the resulting ratio to // be higher, since we have explicitly asked for a higher complexity setting at // the lower rate. -TEST(AudioEncoderOpusComplexityAdaptationTest, AdaptationOn) { +TEST(MAYBE_AudioEncoderOpusComplexityAdaptationTest, AdaptationOn) { // Create config. AudioEncoderOpus::Config config; config.bitrate_bps = rtc::Optional(12500); @@ -77,7 +85,7 @@ TEST(AudioEncoderOpusComplexityAdaptationTest, AdaptationOn) { // This test is identical to the one above, but without the complexity // adaptation enabled (neither on desktop, nor on mobile). The expectation is // that the resulting ratio is less than 100% at all times. -TEST(AudioEncoderOpusComplexityAdaptationTest, AdaptationOff) { +TEST(MAYBE_AudioEncoderOpusComplexityAdaptationTest, AdaptationOff) { // Create config. AudioEncoderOpus::Config config; config.bitrate_bps = rtc::Optional(12500);