diff --git a/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc index ef0e92b2ea..34aab019df 100644 --- a/modules/audio_coding/test/TestRedFec.cc +++ b/modules/audio_coding/test/TestRedFec.cc @@ -20,18 +20,6 @@ #include "test/testsupport/fileutils.h" #include "typedefs.h" // NOLINT(build/include) -#ifdef SUPPORT_RED_WB -#undef SUPPORT_RED_WB -#endif - -#ifdef SUPPORT_RED_SWB -#undef SUPPORT_RED_SWB -#endif - -#ifdef SUPPORT_RED_FB -#undef SUPPORT_RED_FB -#endif - namespace webrtc { namespace { @@ -107,37 +95,22 @@ void TestRedFec::Perform() { EXPECT_EQ(0, RegisterSendCodec('A', kNameG722, 16000)); EXPECT_EQ(0, RegisterSendCodec('A', kNameCN, 16000)); -#ifdef SUPPORT_RED_WB - // Switch codec, RED should remain. - EXPECT_TRUE(_acmA->REDStatus()); -#else // Switch to a 16 kHz codec, RED should have been switched off. EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); EXPECT_EQ(0, SetVAD(true, true, VADAggr)); EXPECT_EQ(0, _acmA->SetREDStatus(false)); EXPECT_FALSE(_acmA->REDStatus()); Run(); -#ifdef SUPPORT_RED_WB - EXPECT_EQ(0, _acmA->SetREDStatus(true)); - EXPECT_TRUE(_acmA->REDStatus()); -#else EXPECT_EQ(-1, _acmA->SetREDStatus(true)); EXPECT_FALSE(_acmA->REDStatus()); -#endif Run(); _outFileB.Close(); RegisterSendCodec('A', kNameISAC, 16000); -#ifdef SUPPORT_RED_WB - // Switch codec, RED should remain. - EXPECT_TRUE(_acmA->REDStatus()); -#else EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); EXPECT_EQ(0, SetVAD(true, true, VADVeryAggr)); @@ -146,26 +119,16 @@ void TestRedFec::Perform() { Run(); _outFileB.Close(); -#ifdef SUPPORT_RED_WB - EXPECT_EQ(0, _acmA->SetREDStatus(true)); - EXPECT_TRUE(_acmA->REDStatus()); -#else EXPECT_EQ(-1, _acmA->SetREDStatus(true)); EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); Run(); _outFileB.Close(); RegisterSendCodec('A', kNameISAC, 32000); -#if defined(SUPPORT_RED_SWB) && defined(SUPPORT_RED_WB) - // Switch codec, RED should remain. - EXPECT_TRUE(_acmA->REDStatus()); -#else // Switch to a 32 kHz codec, RED should have been switched off. EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); EXPECT_EQ(0, SetVAD(true, true, VADVeryAggr)); @@ -174,13 +137,8 @@ void TestRedFec::Perform() { Run(); _outFileB.Close(); -#ifdef SUPPORT_RED_SWB - EXPECT_EQ(0, _acmA->SetREDStatus(true)); - EXPECT_TRUE(_acmA->REDStatus()); -#else EXPECT_EQ(-1, _acmA->SetREDStatus(true)); EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); Run(); _outFileB.Close(); @@ -188,28 +146,8 @@ void TestRedFec::Perform() { RegisterSendCodec('A', kNameISAC, 32000); EXPECT_EQ(0, SetVAD(false, false, VADNormal)); -#if defined(SUPPORT_RED_SWB) && defined(SUPPORT_RED_WB) - OpenOutFile(_testCntr); - EXPECT_EQ(0, _acmA->SetREDStatus(true)); - EXPECT_TRUE(_acmA->REDStatus()); - Run(); - - RegisterSendCodec('A', kNameISAC, 16000); - EXPECT_TRUE(_acmA->REDStatus()); - Run(); - - RegisterSendCodec('A', kNameISAC, 32000); - EXPECT_TRUE(_acmA->REDStatus()); - Run(); - - RegisterSendCodec('A', kNameISAC, 16000); - EXPECT_TRUE(_acmA->REDStatus()); - Run(); - _outFileB.Close(); -#else EXPECT_EQ(-1, _acmA->SetREDStatus(true)); EXPECT_FALSE(_acmA->REDStatus()); -#endif _channelA2B->SetFECTestWithPacketLoss(true); // Following tests are under packet losses. @@ -217,13 +155,8 @@ void TestRedFec::Perform() { EXPECT_EQ(0, RegisterSendCodec('A', kNameG722)); EXPECT_EQ(0, RegisterSendCodec('A', kNameCN, 16000)); -#if defined(SUPPORT_RED_WB) && defined(SUPPORT_RED_SWB) - // Switch codec, RED should remain. - EXPECT_TRUE(_acmA->REDStatus()); -#else // Switch to a 16 kHz codec, RED should have been switched off. EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); EXPECT_EQ(0, SetVAD(true, true, VADAggr)); @@ -232,26 +165,16 @@ void TestRedFec::Perform() { Run(); _outFileB.Close(); -#ifdef SUPPORT_RED_WB - EXPECT_EQ(0, _acmA->SetREDStatus(true)); - EXPECT_TRUE(_acmA->REDStatus()); -#else EXPECT_EQ(-1, _acmA->SetREDStatus(true)); EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); Run(); _outFileB.Close(); RegisterSendCodec('A', kNameISAC, 16000); -#ifdef SUPPORT_RED_WB - // Switch codec, RED should remain. - EXPECT_TRUE(_acmA->REDStatus()); -#else // Switch to a 16 kHz codec, RED should have been switched off. EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); EXPECT_EQ(0, SetVAD(true, true, VADVeryAggr)); @@ -259,66 +182,31 @@ void TestRedFec::Perform() { EXPECT_FALSE(_acmA->REDStatus()); Run(); _outFileB.Close(); -#ifdef SUPPORT_RED_WB - EXPECT_EQ(0, _acmA->SetREDStatus(true)); - EXPECT_TRUE(_acmA->REDStatus()); -#else EXPECT_EQ(-1, _acmA->SetREDStatus(true)); EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); Run(); _outFileB.Close(); RegisterSendCodec('A', kNameISAC, 32000); -#if defined(SUPPORT_RED_SWB) && defined(SUPPORT_RED_WB) - // Switch codec, RED should remain. - EXPECT_TRUE(_acmA->REDStatus()); -#else // Switch to a 32 kHz codec, RED should have been switched off. EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); EXPECT_EQ(0, SetVAD(true, true, VADVeryAggr)); EXPECT_EQ(0, _acmA->SetREDStatus(false)); EXPECT_FALSE(_acmA->REDStatus()); -#ifdef SUPPORT_RED_SWB - EXPECT_EQ(0, _acmA->SetREDStatus(true)); - EXPECT_TRUE(_acmA->REDStatus()); -#else EXPECT_EQ(-1, _acmA->SetREDStatus(true)); EXPECT_FALSE(_acmA->REDStatus()); -#endif OpenOutFile(_testCntr); Run(); _outFileB.Close(); RegisterSendCodec('A', kNameISAC, 32000); EXPECT_EQ(0, SetVAD(false, false, VADNormal)); -#if defined(SUPPORT_RED_SWB) && defined(SUPPORT_RED_WB) - OpenOutFile(_testCntr); - EXPECT_EQ(0, _acmA->SetREDStatus(true)); - EXPECT_TRUE(_acmA->REDStatus()); - Run(); - - RegisterSendCodec('A', kNameISAC, 16000); - EXPECT_TRUE(_acmA->REDStatus()); - Run(); - - RegisterSendCodec('A', kNameISAC, 32000); - EXPECT_TRUE(_acmA->REDStatus()); - Run(); - - RegisterSendCodec('A', kNameISAC, 16000); - EXPECT_TRUE(_acmA->REDStatus()); - Run(); - _outFileB.Close(); -#else EXPECT_EQ(-1, _acmA->SetREDStatus(true)); EXPECT_FALSE(_acmA->REDStatus()); -#endif #ifndef WEBRTC_CODEC_OPUS EXPECT_TRUE(false); @@ -328,33 +216,14 @@ void TestRedFec::Perform() { RegisterSendCodec('A', kNameOPUS, 48000); -#if defined(SUPPORT_RED_FB) && defined(SUPPORT_RED_SWB) &&\ - defined(SUPPORT_RED_WB) - // Switch to codec, RED should remain switched on. - EXPECT_TRUE(_acmA->REDStatus()); -#else EXPECT_FALSE(_acmA->REDStatus()); -#endif // _channelA2B imposes 25% packet loss rate. EXPECT_EQ(0, _acmA->SetPacketLossRate(25)); -#ifdef SUPPORT_RED_FB - EXPECT_EQ(0, _acmA->SetREDStatus(true)); - EXPECT_TRUE(_acmA->REDStatus()); - // Codec FEC and RED are mutually exclusive. - EXPECT_EQ(-1, _acmA->SetCodecFEC(true)); - - EXPECT_EQ(0, _acmA->SetREDStatus(false)); - EXPECT_EQ(0, _acmA->SetCodecFEC(true)); - - // Codec FEC and RED are mutually exclusive. - EXPECT_EQ(-1, _acmA->SetREDStatus(true)); -#else EXPECT_EQ(-1, _acmA->SetREDStatus(true)); EXPECT_FALSE(_acmA->REDStatus()); EXPECT_EQ(0, _acmA->SetCodecFEC(true)); -#endif EXPECT_TRUE(_acmA->CodecFEC()); OpenOutFile(_testCntr); @@ -373,12 +242,7 @@ void TestRedFec::Perform() { // Switch to Opus again. RegisterSendCodec('A', kNameOPUS, 48000); -#ifdef SUPPORT_RED_FB - // Switch to codec, RED should remain switched on. - EXPECT_TRUE(_acmA->REDStatus()); -#else EXPECT_FALSE(_acmA->REDStatus()); -#endif EXPECT_EQ(0, _acmA->SetREDStatus(false)); EXPECT_EQ(0, _acmA->SetCodecFEC(false)); Run();