Index: webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc |
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc |
index 5c3b81383069bf1b2b693defcb903f777f16a8ce..01c8bb8e78e3e5ecc1d993ba658a042c4f7f652a 100644 |
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc |
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc |
@@ -342,9 +342,16 @@ TEST_F(AudioCodingModuleTestOldApi, TransportCallbackIsInvokedForEachPacket) { |
EXPECT_EQ(kAudioFrameSpeech, packet_cb_.last_frame_type()); |
} |
+#if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX) |
+#define IF_ISAC(x) x |
+#else |
+#define IF_ISAC(x) DISABLED_##x |
+#endif |
+ |
// Verifies that the RTP timestamp series is not reset when the codec is |
// changed. |
-TEST_F(AudioCodingModuleTestOldApi, TimestampSeriesContinuesWhenCodecChanges) { |
+TEST_F(AudioCodingModuleTestOldApi, |
+ IF_ISAC(TimestampSeriesContinuesWhenCodecChanges)) { |
RegisterCodec(); // This registers the default codec. |
uint32_t expected_ts = input_frame_.timestamp_; |
int blocks_per_packet = codec_.pacsize / (kSampleRateHz / 100); |
@@ -700,7 +707,7 @@ class AcmIsacMtTestOldApi : public AudioCodingModuleMtTestOldApi { |
test::AudioLoop audio_loop_; |
}; |
-TEST_F(AcmIsacMtTestOldApi, DISABLED_ON_IOS(DoTest)) { |
+TEST_F(AcmIsacMtTestOldApi, DISABLED_ON_IOS(IF_ISAC(DoTest))) { |
EXPECT_EQ(kEventSignaled, RunTest()); |
} |
@@ -854,7 +861,7 @@ class AcmReRegisterIsacMtTestOldApi : public AudioCodingModuleTestOldApi { |
test::AudioLoop audio_loop_; |
}; |
-TEST_F(AcmReRegisterIsacMtTestOldApi, DISABLED_ON_IOS(DoTest)) { |
+TEST_F(AcmReRegisterIsacMtTestOldApi, DISABLED_ON_IOS(IF_ISAC(DoTest))) { |
EXPECT_EQ(kEventSignaled, RunTest()); |
} |
@@ -926,13 +933,20 @@ class AcmReceiverBitExactnessOldApi : 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(AcmReceiverBitExactnessOldApi, MAYBE_8kHzOutput) { |
+TEST_F(AcmReceiverBitExactnessOldApi, IF_ALL_CODECS(MAYBE_8kHzOutput)) { |
Run(8000, PlatformChecksum("dcee98c623b147ebe1b40dd30efa896e", |
"adc92e173f908f93b96ba5844209815a", |
"908002dc01fc4eb1d2be24eb1d3f354b"), |
@@ -945,7 +959,7 @@ TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_8kHzOutput) { |
#else |
#define MAYBE_16kHzOutput 16kHzOutput |
#endif |
-TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_16kHzOutput) { |
+TEST_F(AcmReceiverBitExactnessOldApi, IF_ALL_CODECS(MAYBE_16kHzOutput)) { |
Run(16000, PlatformChecksum("f790e7a8cce4e2c8b7bb5e0e4c5dac0d", |
"8cffa6abcb3e18e33b9d857666dff66a", |
"a909560b5ca49fa472b17b7b277195e9"), |
@@ -958,7 +972,7 @@ TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_16kHzOutput) { |
#else |
#define MAYBE_32kHzOutput 32kHzOutput |
#endif |
-TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_32kHzOutput) { |
+TEST_F(AcmReceiverBitExactnessOldApi, IF_ALL_CODECS(MAYBE_32kHzOutput)) { |
Run(32000, PlatformChecksum("306e0d990ee6e92de3fbecc0123ece37", |
"3e126fe894720c3f85edadcc91964ba5", |
"441aab4b347fb3db4e9244337aca8d8e"), |
@@ -971,7 +985,7 @@ TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_32kHzOutput) { |
#else |
#define MAYBE_48kHzOutput 48kHzOutput |
#endif |
-TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_48kHzOutput) { |
+TEST_F(AcmReceiverBitExactnessOldApi, IF_ALL_CODECS(MAYBE_48kHzOutput)) { |
Run(48000, PlatformChecksum("aa7c232f63a67b2a72703593bdd172e0", |
"0155665e93067c4e89256b944dd11999", |
"4ee2730fa1daae755e8a8fd3abd779ec"), |
@@ -984,7 +998,8 @@ TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_48kHzOutput) { |
#else |
#define MAYBE_48kHzOutputExternalDecoder 48kHzOutputExternalDecoder |
#endif |
-TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_48kHzOutputExternalDecoder) { |
+TEST_F(AcmReceiverBitExactnessOldApi, |
+ IF_ALL_CODECS(MAYBE_48kHzOutputExternalDecoder)) { |
AudioDecoderPcmU decoder(1); |
MockAudioDecoder mock_decoder; |
// Set expectations on the mock decoder and also delegate the calls to the |
@@ -1200,7 +1215,7 @@ class AcmSenderBitExactnessOldApi : public ::testing::Test, |
#else |
#define MAYBE_IsacWb30ms IsacWb30ms |
#endif |
-TEST_F(AcmSenderBitExactnessOldApi, MAYBE_IsacWb30ms) { |
+TEST_F(AcmSenderBitExactnessOldApi, IF_ISAC(MAYBE_IsacWb30ms)) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 480, 480)); |
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( |
"c7e5bdadfa2871df95639fcc297cf23d", |
@@ -1220,7 +1235,7 @@ TEST_F(AcmSenderBitExactnessOldApi, MAYBE_IsacWb30ms) { |
#else |
#define MAYBE_IsacWb60ms IsacWb60ms |
#endif |
-TEST_F(AcmSenderBitExactnessOldApi, MAYBE_IsacWb60ms) { |
+TEST_F(AcmSenderBitExactnessOldApi, IF_ISAC(MAYBE_IsacWb60ms)) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 960, 960)); |
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( |
"14d63c5f08127d280e722e3191b73bdd", |
@@ -1234,7 +1249,14 @@ TEST_F(AcmSenderBitExactnessOldApi, MAYBE_IsacWb60ms) { |
test::AcmReceiveTestOldApi::kMonoOutput); |
} |
-TEST_F(AcmSenderBitExactnessOldApi, 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(AcmSenderBitExactnessOldApi, |
+ DISABLED_ON_ANDROID(IF_ISAC_FLOAT(IsacSwb30ms))) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 32000, 1, 104, 960, 960)); |
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( |
"2b3c387d06f00b7b7aad4c9be56fb83d", |
@@ -1327,7 +1349,13 @@ TEST_F(AcmSenderBitExactnessOldApi, Pcma_stereo_20ms) { |
test::AcmReceiveTestOldApi::kStereoOutput); |
} |
-TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(Ilbc_30ms)) { |
+#ifdef WEBRTC_CODEC_ILBC |
+#define IF_ILBC(x) x |
+#else |
+#define IF_ILBC(x) DISABLED_##x |
+#endif |
+ |
+TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(IF_ILBC(Ilbc_30ms))) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest("ILBC", 8000, 1, 102, 240, 240)); |
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( |
"7b6ec10910debd9af08011d3ed5249f7", |
@@ -1341,7 +1369,13 @@ TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(Ilbc_30ms)) { |
test::AcmReceiveTestOldApi::kMonoOutput); |
} |
-TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(G722_20ms)) { |
+#ifdef WEBRTC_CODEC_G722 |
+#define IF_G722(x) x |
+#else |
+#define IF_G722(x) DISABLED_##x |
+#endif |
+ |
+TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(IF_G722(G722_20ms))) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest("G722", 16000, 1, 9, 320, 160)); |
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( |
"7d759436f2533582950d148b5161a36c", |
@@ -1355,7 +1389,8 @@ TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(G722_20ms)) { |
test::AcmReceiveTestOldApi::kMonoOutput); |
} |
-TEST_F(AcmSenderBitExactnessOldApi, DISABLED_ON_ANDROID(G722_stereo_20ms)) { |
+TEST_F(AcmSenderBitExactnessOldApi, |
+ DISABLED_ON_ANDROID(IF_G722(G722_stereo_20ms))) { |
ASSERT_NO_FATAL_FAILURE(SetUpTest("G722", 16000, 2, 119, 320, 160)); |
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( |
"7190ee718ab3d80eca181e5f7140c210", |