Less strict audio codec tests to accomodate opus switch to SSE.
Expected checksums depend on whether libopus is built with SSE or not.
Since we have no robust way to know that and we cannot enforce all
clients to use SSE, we accept both results.
Bug: webrtc:9530
Bug: webrtc:9995
Change-Id: I9f0464ffec15df91eafe15d89c61e2140f341cb1
Reviewed-on: https://webrtc-review.googlesource.com/c/110789
Commit-Queue: Yves Gerey <yvesg@webrtc.org>
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25633}diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
index b227cfb..4e262f7 100644
--- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc
+++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
@@ -1183,14 +1183,14 @@
// Extract and verify the audio checksum.
std::string checksum_string = audio_checksum.Finish();
- EXPECT_EQ(audio_checksum_ref, checksum_string);
+ ExpectChecksumEq(audio_checksum_ref, checksum_string);
// Extract and verify the payload checksum.
rtc::Buffer checksum_result(payload_checksum_->Size());
payload_checksum_->Finish(checksum_result.data(), checksum_result.size());
checksum_string =
rtc::hex_encode(checksum_result.data<char>(), checksum_result.size());
- EXPECT_EQ(payload_checksum_ref, checksum_string);
+ ExpectChecksumEq(payload_checksum_ref, checksum_string);
// Verify number of packets produced.
EXPECT_EQ(expected_packets, packet_count_);
@@ -1199,6 +1199,18 @@
remove(output_file_name.c_str());
}
+ // Helper: result must be one the "|"-separated checksums.
+ void ExpectChecksumEq(std::string ref, std::string result) {
+ if (ref.size() == result.size()) {
+ // Only one checksum: clearer message.
+ EXPECT_EQ(ref, result);
+ } else {
+ EXPECT_NE(ref.find(result), std::string::npos)
+ << result << " must be one of these:\n"
+ << ref;
+ }
+ }
+
// Inherited from test::PacketSource.
std::unique_ptr<test::Packet> NextPacket() override {
auto packet = send_test_->NextPacket();
@@ -1436,21 +1448,35 @@
50, test::AcmReceiveTestOldApi::kStereoOutput);
}
+namespace {
+// Checksum depends on libopus being compiled with or without SSE.
+const std::string audio_maybe_sse =
+ "3e285b74510e62062fbd8142dacd16e9|"
+ "fd5d57d6d766908e6a7211e2a5c7f78a";
+const std::string payload_maybe_sse =
+ "78cf8f03157358acdc69f6835caa0d9b|"
+ "b693bd95c2ee2354f92340dd09e9da68";
+// Common checksums.
+const std::string audio_checksum =
+ AcmReceiverBitExactnessOldApi::PlatformChecksum(
+ audio_maybe_sse,
+ audio_maybe_sse,
+ "439e97ad1932c49923b5da029c17dd5e",
+ "038ec90f5f3fc2320f3090f8ecef6bb7",
+ "038ec90f5f3fc2320f3090f8ecef6bb7");
+const std::string payload_checksum =
+ AcmReceiverBitExactnessOldApi::PlatformChecksum(
+ payload_maybe_sse,
+ payload_maybe_sse,
+ "ab88b1a049c36bdfeb7e8b057ef6982a",
+ "27fef7b799393347ec3b5694369a1c36",
+ "27fef7b799393347ec3b5694369a1c36");
+}; // namespace
+
TEST_F(AcmSenderBitExactnessOldApi, Opus_stereo_20ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 2, 120, 960, 960));
- Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "3e285b74510e62062fbd8142dacd16e9",
- "3e285b74510e62062fbd8142dacd16e9",
- "439e97ad1932c49923b5da029c17dd5e",
- "038ec90f5f3fc2320f3090f8ecef6bb7",
- "038ec90f5f3fc2320f3090f8ecef6bb7"),
- AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "78cf8f03157358acdc69f6835caa0d9b",
- "78cf8f03157358acdc69f6835caa0d9b",
- "ab88b1a049c36bdfeb7e8b057ef6982a",
- "27fef7b799393347ec3b5694369a1c36",
- "27fef7b799393347ec3b5694369a1c36"),
- 50, test::AcmReceiveTestOldApi::kStereoOutput);
+ Run(audio_checksum, payload_checksum, 50,
+ test::AcmReceiveTestOldApi::kStereoOutput);
}
TEST_F(AcmSenderBitExactnessNewApi, MAYBE_OpusFromFormat_stereo_20ms) {
@@ -1458,19 +1484,8 @@
SdpAudioFormat("opus", 48000, 2, {{"stereo", "1"}}));
ASSERT_NO_FATAL_FAILURE(SetUpTestExternalEncoder(
AudioEncoderOpus::MakeAudioEncoder(*config, 120), 120));
- Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "3e285b74510e62062fbd8142dacd16e9",
- "3e285b74510e62062fbd8142dacd16e9",
- "439e97ad1932c49923b5da029c17dd5e",
- "038ec90f5f3fc2320f3090f8ecef6bb7",
- "038ec90f5f3fc2320f3090f8ecef6bb7"),
- AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "78cf8f03157358acdc69f6835caa0d9b",
- "78cf8f03157358acdc69f6835caa0d9b",
- "ab88b1a049c36bdfeb7e8b057ef6982a",
- "27fef7b799393347ec3b5694369a1c36",
- "27fef7b799393347ec3b5694369a1c36"),
- 50, test::AcmReceiveTestOldApi::kStereoOutput);
+ Run(audio_checksum, payload_checksum, 50,
+ test::AcmReceiveTestOldApi::kStereoOutput);
}
TEST_F(AcmSenderBitExactnessNewApi, OpusFromFormat_stereo_20ms_voip) {
@@ -1480,15 +1495,19 @@
config->application = AudioEncoderOpusConfig::ApplicationMode::kVoip;
ASSERT_NO_FATAL_FAILURE(SetUpTestExternalEncoder(
AudioEncoderOpus::MakeAudioEncoder(*config, 120), 120));
+ // Checksum depends on libopus being compiled with or without SSE.
+ const std::string audio_maybe_sse =
+ "b0325df4e8104f04e03af23c0b75800e|"
+ "3cd4e1bc2acd9440bb9e97af34080ffc";
+ const std::string payload_maybe_sse =
+ "4eab2259b6fe24c22dd242a113e0b3d9|"
+ "4fc0af0aa06c26454af09832d3ec1b4e";
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "b0325df4e8104f04e03af23c0b75800e",
- "b0325df4e8104f04e03af23c0b75800e",
- "1c81121f5d9286a5a865d01dbab22ce8",
+ audio_maybe_sse, audio_maybe_sse, "1c81121f5d9286a5a865d01dbab22ce8",
"11d547f89142e9ef03f37d7ca7f32379",
"11d547f89142e9ef03f37d7ca7f32379"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "4eab2259b6fe24c22dd242a113e0b3d9",
- "4eab2259b6fe24c22dd242a113e0b3d9",
+ payload_maybe_sse, payload_maybe_sse,
"839ea60399447268ee0f0262a50b75fd",
"1815fd5589cad0c6f6cf946c76b81aeb",
"1815fd5589cad0c6f6cf946c76b81aeb"),
diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
index 1c9b9e7..2130a24 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_unittest.cc
@@ -234,7 +234,14 @@
buffer.resize(digest_->Size());
digest_->Finish(&buffer[0], buffer.size());
const std::string result = rtc::hex_encode(&buffer[0], digest_->Size());
- EXPECT_EQ(checksum, result);
+ if (checksum.size() == result.size()) {
+ EXPECT_EQ(checksum, result);
+ } else {
+ // Check result is one the '|'-separated checksums.
+ EXPECT_NE(checksum.find(result), std::string::npos)
+ << result << " should be one of these:\n"
+ << checksum;
+ }
}
class NetEqDecodingTest : public ::testing::Test {
@@ -501,12 +508,13 @@
const std::string input_rtp_file =
webrtc::test::ResourcePath("audio_coding/neteq_opus", "rtp");
- const std::string output_checksum =
- PlatformChecksum("14a63b3c7b925c82296be4bafc71bec85f2915c2",
- "b7b7ed802b0e18ee416973bf3b9ae98599b0181d",
- "5876e52dda90d5ca433c3726555b907b97c86374",
- "14a63b3c7b925c82296be4bafc71bec85f2915c2",
- "14a63b3c7b925c82296be4bafc71bec85f2915c2");
+ // Checksum depends on libopus being compiled with or without SSE.
+ const std::string maybe_sse =
+ "14a63b3c7b925c82296be4bafc71bec85f2915c2|"
+ "2c05677daa968d6c68b92adf4affb7cd9bb4d363";
+ const std::string output_checksum = PlatformChecksum(
+ maybe_sse, "b7b7ed802b0e18ee416973bf3b9ae98599b0181d",
+ "5876e52dda90d5ca433c3726555b907b97c86374", maybe_sse, maybe_sse);
const std::string network_stats_checksum =
PlatformChecksum("adb3272498e436d1c019cbfd71610e9510c54497",
@@ -536,12 +544,12 @@
const std::string input_rtp_file =
webrtc::test::ResourcePath("audio_coding/neteq_opus_dtx", "rtp");
- const std::string output_checksum =
- PlatformChecksum("713af6c92881f5aab1285765ee6680da9d1c06ce",
- "3ec991b96872123f1554c03c543ca5d518431e46",
- "da9f9a2d94e0c2d67342fad4965d7b91cda50b25",
- "713af6c92881f5aab1285765ee6680da9d1c06ce",
- "713af6c92881f5aab1285765ee6680da9d1c06ce");
+ const std::string maybe_sse =
+ "713af6c92881f5aab1285765ee6680da9d1c06ce|"
+ "2ac10c4e79aeedd0df2863b079da5848b40f00b5";
+ const std::string output_checksum = PlatformChecksum(
+ maybe_sse, "3ec991b96872123f1554c03c543ca5d518431e46",
+ "da9f9a2d94e0c2d67342fad4965d7b91cda50b25", maybe_sse, maybe_sse);
const std::string network_stats_checksum =
"bab58dc587d956f326056d7340c96eb9d2d3cc21";