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

Unified Diff: webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc

Issue 2589673002: Re-enable Opus complexity tests on Android (Closed)
Patch Set: Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
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 5339cffdfc7ed31ba6d7a97cfa947b9bfd1eece1..83a4539d0c3a2c4c175b17756c2f00c132278bc5 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
+++ b/webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc
@@ -49,14 +49,6 @@ 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
@@ -67,7 +59,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(MAYBE_AudioEncoderOpusComplexityAdaptationTest, AdaptationOn) {
+TEST(AudioEncoderOpusComplexityAdaptationTest, AdaptationOn) {
// Create config.
AudioEncoderOpus::Config config;
config.bitrate_bps = rtc::Optional<int>(12500);
@@ -85,7 +77,7 @@ TEST(MAYBE_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(MAYBE_AudioEncoderOpusComplexityAdaptationTest, AdaptationOff) {
+TEST(AudioEncoderOpusComplexityAdaptationTest, AdaptationOff) {
// Create config.
AudioEncoderOpus::Config config;
config.bitrate_bps = rtc::Optional<int>(12500);
« 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