Index: webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc |
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc |
index 418ddd111f104eb67f71c6216fdeaf4764f9a20e..c12baf3f4047acbede681e84f87b40869be0f1ee 100644 |
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc |
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc |
@@ -504,7 +504,13 @@ class AcmIsacMtTest : public AudioCodingModuleMtTest { |
test::AudioLoop audio_loop_; |
}; |
-TEST_F(AcmIsacMtTest, DoTest) { |
+#if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX) |
+#define IF_ISAC(x) x |
+#else |
+#define IF_ISAC(x) DISABLED_##x |
+#endif |
+ |
+TEST_F(AcmIsacMtTest, IF_ISAC(DoTest)) { |
EXPECT_EQ(kEventSignaled, RunTest()); |
} |
@@ -559,13 +565,20 @@ class AcmReceiverBitExactness : public ::testing::Test { |
} |
}; |
+#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISAC)) && \ |
+ defined(WEBRTC_CODEC_ILBC) && defined(WEBRTC_CODEC_G722) |
+#define IF_ALL_CODECS(x) x |
+#else |
+#define IF_ALL_CODECS(x) DISABLED_##x |
+#endif |
+ |
// Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 |
#if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM64) |
#define MAYBE_8kHzOutput DISABLED_8kHzOutput |
#else |
#define MAYBE_8kHzOutput 8kHzOutput |
#endif |
-TEST_F(AcmReceiverBitExactness, MAYBE_8kHzOutput) { |
+TEST_F(AcmReceiverBitExactness, IF_ALL_CODECS(MAYBE_8kHzOutput)) { |
Run(8000, |
PlatformChecksum("dcee98c623b147ebe1b40dd30efa896e", |
"adc92e173f908f93b96ba5844209815a", |
@@ -578,7 +591,7 @@ TEST_F(AcmReceiverBitExactness, MAYBE_8kHzOutput) { |
#else |
#define MAYBE_16kHzOutput 16kHzOutput |
#endif |
-TEST_F(AcmReceiverBitExactness, MAYBE_16kHzOutput) { |
+TEST_F(AcmReceiverBitExactness, IF_ALL_CODECS(MAYBE_16kHzOutput)) { |
Run(16000, |
PlatformChecksum("f790e7a8cce4e2c8b7bb5e0e4c5dac0d", |
"8cffa6abcb3e18e33b9d857666dff66a", |
@@ -591,7 +604,7 @@ TEST_F(AcmReceiverBitExactness, MAYBE_16kHzOutput) { |
#else |
#define MAYBE_32kHzOutput 32kHzOutput |
#endif |
-TEST_F(AcmReceiverBitExactness, MAYBE_32kHzOutput) { |
+TEST_F(AcmReceiverBitExactness, IF_ALL_CODECS(MAYBE_32kHzOutput)) { |
Run(32000, |
PlatformChecksum("306e0d990ee6e92de3fbecc0123ece37", |
"3e126fe894720c3f85edadcc91964ba5", |
@@ -604,7 +617,7 @@ TEST_F(AcmReceiverBitExactness, MAYBE_32kHzOutput) { |
#else |
#define MAYBE_48kHzOutput 48kHzOutput |
#endif |
-TEST_F(AcmReceiverBitExactness, MAYBE_48kHzOutput) { |
+TEST_F(AcmReceiverBitExactness, IF_ALL_CODECS(MAYBE_48kHzOutput)) { |
Run(48000, |
PlatformChecksum("aa7c232f63a67b2a72703593bdd172e0", |
"0155665e93067c4e89256b944dd11999", |
@@ -770,7 +783,7 @@ class AcmSenderBitExactness : public ::testing::Test, |
#else |
#define MAYBE_IsacWb30ms IsacWb30ms |
#endif |
-TEST_F(AcmSenderBitExactness, MAYBE_IsacWb30ms) { |
+TEST_F(AcmSenderBitExactness, IF_ISAC(MAYBE_IsacWb30ms)) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest(acm2::ACMCodecDB::kISAC, 1, 103, 480, 480)); |
Run(AcmReceiverBitExactness::PlatformChecksum( |
"c7e5bdadfa2871df95639fcc297cf23d", |
@@ -790,7 +803,7 @@ TEST_F(AcmSenderBitExactness, MAYBE_IsacWb30ms) { |
#else |
#define MAYBE_IsacWb60ms IsacWb60ms |
#endif |
-TEST_F(AcmSenderBitExactness, MAYBE_IsacWb60ms) { |
+TEST_F(AcmSenderBitExactness, IF_ISAC(MAYBE_IsacWb60ms)) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest(acm2::ACMCodecDB::kISAC, 1, 103, 960, 960)); |
Run(AcmReceiverBitExactness::PlatformChecksum( |
"14d63c5f08127d280e722e3191b73bdd", |
@@ -804,7 +817,13 @@ TEST_F(AcmSenderBitExactness, MAYBE_IsacWb60ms) { |
test::AcmReceiveTest::kMonoOutput); |
} |
-TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(IsacSwb30ms)) { |
+#ifdef WEBRTC_CODEC_ISAC |
+#define IF_ISAC_FLOAT(x) x |
+#else |
+#define IF_ISAC_FLOAT(x) DISABLED_##x |
+#endif |
+ |
+TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(IF_ISAC_FLOAT(IsacSwb30ms))) { |
ASSERT_NO_FATAL_FAILURE( |
SetUpTest(acm2::ACMCodecDB::kISACSWB, 1, 104, 960, 960)); |
Run(AcmReceiverBitExactness::PlatformChecksum( |
@@ -905,7 +924,13 @@ TEST_F(AcmSenderBitExactness, Pcma_stereo_20ms) { |
test::AcmReceiveTest::kStereoOutput); |
} |
-TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(Ilbc_30ms)) { |
+#ifdef WEBRTC_CODEC_ILBC |
+#define IF_ILBC(x) x |
+#else |
+#define IF_ILBC(x) DISABLED_##x |
+#endif |
+ |
+TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(IF_ILBC(Ilbc_30ms))) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest(acm2::ACMCodecDB::kILBC, 1, 102, 240, 240)); |
Run(AcmReceiverBitExactness::PlatformChecksum( |
"7b6ec10910debd9af08011d3ed5249f7", |
@@ -919,7 +944,13 @@ TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(Ilbc_30ms)) { |
test::AcmReceiveTest::kMonoOutput); |
} |
-TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(G722_20ms)) { |
+#ifdef WEBRTC_CODEC_G722 |
+#define IF_G722(x) x |
+#else |
+#define IF_G722(x) DISABLED_##x |
+#endif |
+ |
+TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(IF_G722(G722_20ms))) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest(acm2::ACMCodecDB::kG722, 1, 9, 320, 160)); |
Run(AcmReceiverBitExactness::PlatformChecksum( |
"7d759436f2533582950d148b5161a36c", |
@@ -933,7 +964,7 @@ TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(G722_20ms)) { |
test::AcmReceiveTest::kMonoOutput); |
} |
-TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(G722_stereo_20ms)) { |
+TEST_F(AcmSenderBitExactness, DISABLED_ON_ANDROID(IF_G722(G722_stereo_20ms))) { |
ASSERT_NO_FATAL_FAILURE( |
SetUpTest(acm2::ACMCodecDB::kG722_2ch, 2, 119, 320, 160)); |
Run(AcmReceiverBitExactness::PlatformChecksum( |