From 75e2290af2dcfd134857dbee403babbcdf3ad516 Mon Sep 17 00:00:00 2001 From: Yves Gerey Date: Fri, 6 Sep 2019 03:07:55 +0200 Subject: [PATCH] Rollback to strict audio codec tests for libopus on android (neon). This a revert of the manual accommodation done in [1]. The lenient tests are no longer needed since a proper libopus fix [2] has been rolled in [3]. [1] https://webrtc-review.googlesource.com/c/src/+/148700 [2] https://chromium-review.googlesource.com/c/chromium/src/+/1785648 [3] https://webrtc-review.googlesource.com/c/src/+/151721/ Bug: webrtc:9995, chromium:986727 Change-Id: I7f64a45ccbe2c4d985ba663cf77c6fa0efebd528 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/151781 Reviewed-by: Henrik Lundin Commit-Queue: Yves Gerey Cr-Commit-Position: refs/heads/master@{#29089} --- .../acm2/audio_coding_module_unittest.cc | 12 +++------- modules/audio_coding/neteq/neteq_unittest.cc | 23 +++++++------------ 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc index b0dd90cc46..04bbe73c6e 100644 --- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc +++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc @@ -1536,19 +1536,13 @@ TEST_F(AcmSenderBitExactnessNewApi, OpusFromFormat_stereo_20ms_voip) { const std::string payload_maybe_sse = "4eab2259b6fe24c22dd242a113e0b3d9|" "4fc0af0aa06c26454af09832d3ec1b4e"; - // The neon implementation may differ. - const std::string maybe_neon = - "1c81121f5d9286a5a865d01dbab22ce8|" - "26021bd11a81ed1ee4f85d692a4130a4"; - const std::string payload_maybe_neon = - "839ea60399447268ee0f0262a50b75fd|" - "968404a1e18b103985e8454eb1e95142"; Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( - audio_maybe_sse, audio_maybe_sse, maybe_neon, + audio_maybe_sse, audio_maybe_sse, "1c81121f5d9286a5a865d01dbab22ce8", "11d547f89142e9ef03f37d7ca7f32379", "11d547f89142e9ef03f37d7ca7f32379"), AcmReceiverBitExactnessOldApi::PlatformChecksum( - payload_maybe_sse, payload_maybe_sse, payload_maybe_neon, + payload_maybe_sse, payload_maybe_sse, + "839ea60399447268ee0f0262a50b75fd", "1815fd5589cad0c6f6cf946c76b81aeb", "1815fd5589cad0c6f6cf946c76b81aeb"), 50, test::AcmReceiveTestOldApi::kStereoOutput); diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc index 0db6fc7b73..b1ec2162b9 100644 --- a/modules/audio_coding/neteq/neteq_unittest.cc +++ b/modules/audio_coding/neteq/neteq_unittest.cc @@ -485,23 +485,16 @@ TEST_F(NetEqDecodingTest, MAYBE_TestOpusBitExactness) { const std::string maybe_sse = "6b602683ca7285a98118b4824d72f4257952c18f|" "eb0b68bddcac00fc85403df64f83126f8ea9bc93"; - // The neon implementation may differ. - const std::string maybe_neon = - "f95f2a220c9ca5d60b81c4653d46e0de2bee159f|" - "63651b8cc7711a66c9491d6b6ce94b774b64a0ce"; const std::string output_checksum = PlatformChecksum( - maybe_sse, maybe_neon, "6f288a03d34958f62496f18fa85655593eef4dbe", - maybe_sse, maybe_sse); + maybe_sse, "f95f2a220c9ca5d60b81c4653d46e0de2bee159f", + "6f288a03d34958f62496f18fa85655593eef4dbe", maybe_sse, maybe_sse); - // The neon implementation may differ. - const std::string stats_maybe_neon = - "a71dce66c7bea85ba22d4e29a5298f606f810444|" - "6b8c29e39c82f5479f59726744d0cf3e88e725d3"; - const std::string network_stats_checksum = PlatformChecksum( - "87d2d3e5ca7f1b3fb7a501ffaa51ae29aea74544", stats_maybe_neon, - "c876f2a04c4f0a91da7f084f80e87871b7c5a4a1", - "87d2d3e5ca7f1b3fb7a501ffaa51ae29aea74544", - "87d2d3e5ca7f1b3fb7a501ffaa51ae29aea74544"); + const std::string network_stats_checksum = + PlatformChecksum("87d2d3e5ca7f1b3fb7a501ffaa51ae29aea74544", + "6b8c29e39c82f5479f59726744d0cf3e88e725d3", + "c876f2a04c4f0a91da7f084f80e87871b7c5a4a1", + "87d2d3e5ca7f1b3fb7a501ffaa51ae29aea74544", + "87d2d3e5ca7f1b3fb7a501ffaa51ae29aea74544"); DecodeAndCompare(input_rtp_file, output_checksum, network_stats_checksum, absl::GetFlag(FLAGS_gen_ref));