diff --git a/modules/audio_coding/test/EncodeDecodeTest.cc b/modules/audio_coding/test/EncodeDecodeTest.cc index ef997f1bdf..c51ad370d8 100644 --- a/modules/audio_coding/test/EncodeDecodeTest.cc +++ b/modules/audio_coding/test/EncodeDecodeTest.cc @@ -234,10 +234,14 @@ void EncodeDecodeTest::Perform() { {107, {"L16", 8000, 1}}, {108, {"L16", 16000, 1}}, {109, {"L16", 32000, 1}}, {0, {"PCMU", 8000, 1}}, {8, {"PCMA", 8000, 1}}, +// TODO(bugs.webrtc.org/345525069): Either fix/enable or remove G722 and iLBC. +#if defined(__has_feature) && !__has_feature(undefined_behavior_sanitizer) #ifdef WEBRTC_CODEC_ILBC {102, {"ILBC", 8000, 1}}, #endif - {9, {"G722", 8000, 1}}}; + {9, {"G722", 8000, 1}}, +#endif + }; int file_num = 0; for (const auto& send_codec : send_codecs) { RTPFile rtpFile; diff --git a/modules/audio_coding/test/TestAllCodecs.cc b/modules/audio_coding/test/TestAllCodecs.cc index 1a56fbc92b..9d9c317b7c 100644 --- a/modules/audio_coding/test/TestAllCodecs.cc +++ b/modules/audio_coding/test/TestAllCodecs.cc @@ -152,6 +152,9 @@ void TestAllCodecs::Perform() { // All codecs are tested for all allowed sampling frequencies, rates and // packet sizes. + +// TODO(bugs.webrtc.org/345525069): Either fix/enable or remove G722. +#if defined(__has_feature) && !__has_feature(undefined_behavior_sanitizer) test_count_++; OpenOutFile(test_count_); char codec_g722[] = "G722"; @@ -168,6 +171,9 @@ void TestAllCodecs::Perform() { RegisterSendCodec(codec_g722, 16000, 64000, 960, 0); Run(channel_a_to_b_); outfile_b_.Close(); +#endif +// TODO(bugs.webrtc.org/345525069): Either fix/enable or remove iLBC. +#if defined(__has_feature) && !__has_feature(undefined_behavior_sanitizer) #ifdef WEBRTC_CODEC_ILBC test_count_++; OpenOutFile(test_count_); @@ -181,6 +187,7 @@ void TestAllCodecs::Perform() { RegisterSendCodec(codec_ilbc, 8000, 15200, 320, 0); Run(channel_a_to_b_); outfile_b_.Close(); +#endif #endif test_count_++; OpenOutFile(test_count_); diff --git a/modules/audio_coding/test/TestRedFec.cc b/modules/audio_coding/test/TestRedFec.cc index f8acf48508..83e5d61f36 100644 --- a/modules/audio_coding/test/TestRedFec.cc +++ b/modules/audio_coding/test/TestRedFec.cc @@ -77,6 +77,8 @@ void TestRedFec::Perform() { Run(); _outFileB.Close(); +// TODO(bugs.webrtc.org/345525069): Either fix/enable or remove G722. +#if defined(__has_feature) && !__has_feature(undefined_behavior_sanitizer) // Switch to a 16 kHz codec; RED should be switched off. RegisterSendCodec(_acmA, {"G722", 8000, 1}, Vad::kVadAggressive, false); @@ -96,6 +98,7 @@ void TestRedFec::Perform() { OpenOutFile(_testCntr); Run(); _outFileB.Close(); +#endif RegisterSendCodec(_acmA, {"opus", 48000, 2}, absl::nullopt, false); diff --git a/modules/audio_coding/test/TestStereo.cc b/modules/audio_coding/test/TestStereo.cc index 4573a7e613..cf1f91365f 100644 --- a/modules/audio_coding/test/TestStereo.cc +++ b/modules/audio_coding/test/TestStereo.cc @@ -170,6 +170,8 @@ void TestStereo::Perform() { audio_channels = 2; codec_channels = 2; +// TODO(bugs.webrtc.org/345525069): Either fix/enable or remove G722. +#if defined(__has_feature) && !__has_feature(undefined_behavior_sanitizer) // All codecs are tested for all allowed sampling frequencies, rates and // packet sizes. channel_a2b_->set_codec_mode(kStereo); @@ -189,6 +191,7 @@ void TestStereo::Perform() { RegisterSendCodec('A', codec_g722, 16000, 64000, 960, codec_channels); Run(channel_a2b_, audio_channels, codec_channels); out_file_.Close(); +#endif channel_a2b_->set_codec_mode(kStereo); test_cntr_++; @@ -294,12 +297,15 @@ void TestStereo::Perform() { audio_channels = 1; codec_channels = 2; +// TODO(bugs.webrtc.org/345525069): Either fix/enable or remove G722. +#if defined(__has_feature) && !__has_feature(undefined_behavior_sanitizer) test_cntr_++; channel_a2b_->set_codec_mode(kStereo); OpenOutFile(test_cntr_); RegisterSendCodec('A', codec_g722, 16000, 64000, 160, codec_channels); Run(channel_a2b_, audio_channels, codec_channels); out_file_.Close(); +#endif test_cntr_++; channel_a2b_->set_codec_mode(kStereo); @@ -350,12 +356,15 @@ void TestStereo::Perform() { codec_channels = 1; channel_a2b_->set_codec_mode(kMono); +// TODO(bugs.webrtc.org/345525069): Either fix/enable or remove G722. +#if defined(__has_feature) && !__has_feature(undefined_behavior_sanitizer) // Run stereo audio and mono codec. test_cntr_++; OpenOutFile(test_cntr_); RegisterSendCodec('A', codec_g722, 16000, 64000, 160, codec_channels); Run(channel_a2b_, audio_channels, codec_channels); out_file_.Close(); +#endif test_cntr_++; OpenOutFile(test_cntr_); diff --git a/modules/audio_coding/test/TestVADDTX.cc b/modules/audio_coding/test/TestVADDTX.cc index 1789efd714..d6595c047c 100644 --- a/modules/audio_coding/test/TestVADDTX.cc +++ b/modules/audio_coding/test/TestVADDTX.cc @@ -177,7 +177,10 @@ void TestVadDtx::Run(absl::string_view in_filename, TestWebRtcVadDtx::TestWebRtcVadDtx() : output_file_num_(0) {} void TestWebRtcVadDtx::Perform() { +// TODO(bugs.webrtc.org/345525069): Either fix/enable or remove iLBC. +#if defined(__has_feature) && !__has_feature(undefined_behavior_sanitizer) RunTestCases({"ILBC", 8000, 1}); +#endif RunTestCases({"opus", 48000, 2}); }