zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Re-enable Opus complexity tests on Android (patchset #1 id:1 of https://codereview.webrtc.org/2589673002/ )

Browse Source 
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: 14479ddfd4

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}
This commit is contained in:
henrik.lundin
2016-12-19 02:03:33 -08:00
committed by Commit bot
parent 14479ddfd4
commit c3e1cabc69
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
View File

@ -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<int>(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<int>(12500);