Updae bitexactness tests to match new canonical results
This CL has to be submitted together with chromium roll
Roll chromium_revision 48501b3f18..a098e1265b (917742:921682)
Change log: https://chromium.googlesource.com/chromium/src/+log/48501b3f18..a098e1265b
Full diff: https://chromium.googlesource.com/chromium/src/+/48501b3f18..a098e1265b
Changed dependencies
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/bdbd6f899c..ecf6ff89bf
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/f90eed6a5e..fabb3638a7
* src/buildtools/third_party/libc++abi/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/7de86cbf37..a5b6419452
* src/buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/edf77b2d2d..44ea7aba6a
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/1b17fd57e6..e8d5d843cf
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/59835db543..7adcb6a6bf
* src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/a299c990bc..21d7875bec
* src/third_party/android_deps/libs/com_google_auto_auto_common: version:2@0.10.cr0..version:2@1.1.2.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation: version:2@2.7.1.cr0..version:2@2.9.0.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations: version:2@2.7.1.cr0..version:2@2.9.0.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api: version:2@2.7.1.cr0..version:2@2.9.0.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_core: version:2@2.7.1.cr0..version:2@2.9.0.cr0
* src/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations: version:2@2.7.1.cr0..version:2@2.9.0.cr0
* src/third_party/android_deps/libs/com_google_guava_guava: version:2@30.1-jre.cr0..version:2@30.1.1-jre.cr0
* src/third_party/androidx: TnotTDnWGUJDh0mSOMrgnIwzbfWFiwo2NTtr2SlUJ0MC..QRXHawrfyCC8nr_u3VCPoilYsqHO01yv1EiduoQUPcgC
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/dddb60eb97..27a3328a37
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/d9a9ebbe89..6b072fac88
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/789dfc223b..9c67b23020
* src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/7482c98f15..5b626281f1
* src/third_party/googletest/src: https://chromium.googlesource.com/external/github.com/google/googletest.git/+log/955c7f837e..159c9ad23e
* src/third_party/harfbuzz-ng/src: https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+log/280366ba6a..6602cbb706
* src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/ece15d049f..3f443830bd
* src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/15a75b4530..65a1751e5b
* src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/49ebc996aa..0896c34873
* src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/8420673b4c..de98afcd4a
* src/third_party/r8: dvPOJ_8iAF6OHGO79d86VbJjyKj7Xn0SFxlVVC9LHdcC..j4P6kTwiJeMkYRbaOqRCB-ZrYyISP0NrcyNNAd8MRM0C
* src/third_party/usrsctp/usrsctplib: https://chromium.googlesource.com/external/github.com/sctplab/usrsctp/+log/bdf3dd3f28..62d7d0c928
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/e3721e5cf9..a27c09f45b
* src/tools/luci-go: git_revision:7f42370cb3b75398bdb9ae0aabe215a70d40cd31..git_revision:dc21267f89df3981e809fe9566591d6916ae758b
* src/tools/luci-go: git_revision:7f42370cb3b75398bdb9ae0aabe215a70d40cd31..git_revision:dc21267f89df3981e809fe9566591d6916ae758b
* src/tools/luci-go: git_revision:7f42370cb3b75398bdb9ae0aabe215a70d40cd31..git_revision:dc21267f89df3981e809fe9566591d6916ae758b
Added dependency
* src/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone
Removed dependency
* src/third_party/android_deps/libs/org_checkerframework_dataflow_shaded
DEPS diff: https://chromium.googlesource.com/chromium/src/+/48501b3f18..a098e1265b/DEPS
Clang version changed llvmorg-14-init-2175-g945cde8b:llvmorg-14-init-3710-gd11a0c5d
Details: https://chromium.googlesource.com/chromium/src/+/48501b3f18..a098e1265b/tools/clang/scripts/update.py
TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com,marpan@webrtc.org, jianj@chromium.org,
Bug: b/199885455
Change-Id: I64329c57949e9233f5cf65167f012db0637fe4fc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/232061
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35008}
diff --git a/DEPS b/DEPS
index 506bbdb..0bbec5b 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
# chromium waterfalls. More info at: crbug.com/570091.
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
- 'chromium_revision': '48501b3f1824ea2f08759a0bcbe9408a7548bc7f',
+ 'chromium_revision': 'a098e1265b841be991e5afdc726278fccdae7938',
# Keep the Chromium default of generating location tags.
'generate_location_tags': True,
@@ -20,9 +20,9 @@
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
- 'https://chromium.googlesource.com/chromium/src/base@bdbd6f899ce50ac0efc87008384cf25a3eb0a03f',
+ 'https://chromium.googlesource.com/chromium/src/base@ecf6ff89bf5360c984e06127013bb7635137aee2',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@f90eed6a5e137d43526c24eecfd96382a3233ee3',
+ 'https://chromium.googlesource.com/chromium/src/build@fabb3638a7cdcbadafed30f053f6f46249c66775',
'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@7ea3a871db68ae2cbbeaf5433a3192a799ef3c11',
# Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC.
@@ -31,13 +31,13 @@
'condition': 'checkout_android',
},
'src/ios': {
- 'url': 'https://chromium.googlesource.com/chromium/src/ios@1b17fd57e67672c041bab1fb04910bda42cb55bf',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@e8d5d843cfb25a2e091224c96fa120f2cc22475e',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@59835db543d03c36bafe56fb10d6a8b68e377621',
+ 'https://chromium.googlesource.com/chromium/src/testing@7adcb6a6bffcf3bfa9b269ed47cbbff274e1dd3b',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@a299c990bc6b40774066cb84281975a0371e7a8b',
+ 'https://chromium.googlesource.com/chromium/src/third_party@21d7875bec14cdf682d5861bf683046ba29278ef',
'src/buildtools/linux64': {
'packages': [
@@ -75,9 +75,9 @@
'src/buildtools/third_party/libc++/trunk':
'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@79a2e924d96e2fc1e4b937c42efd08898fa472d7',
'src/buildtools/third_party/libc++abi/trunk':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@7de86cbf37e0cf76ffe786ab6a21a728b1027bc2',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@a5b641945224d440bc87cb947c538d676e0dec14',
'src/buildtools/third_party/libunwind/trunk':
- 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@edf77b2d2d2253052f1a3410c7a97e049fc70807',
+ 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@44ea7aba6a34a9250e7793418d83f209a480caf4',
'src/tools/clang/dsymutil': {
'packages': [
@@ -124,11 +124,11 @@
},
'src/third_party/boringssl/src':
- 'https://boringssl.googlesource.com/boringssl.git@dddb60eb9700110835ff6e2b429de40a17006429',
+ 'https://boringssl.googlesource.com/boringssl.git@27a3328a37c320750398bebeaa02f84318811bf3',
'src/third_party/breakpad/breakpad':
'https://chromium.googlesource.com/breakpad/breakpad.git@7933ec0a69bac134b7cee4b60a5dc80743b2b1a9',
'src/third_party/catapult':
- 'https://chromium.googlesource.com/catapult.git@d9a9ebbe89eaa7f479612b4e23ee38a313197d5e',
+ 'https://chromium.googlesource.com/catapult.git@6b072fac8819d18c328c565ff180da0dce959c5f',
'src/third_party/ced/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5',
},
@@ -137,7 +137,7 @@
'src/third_party/crc32c/src':
'https://chromium.googlesource.com/external/github.com/google/crc32c.git@fa5ade41ee480003d9c5af6f43567ba22e4e17e6',
'src/third_party/depot_tools':
- 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@789dfc223b9dfd2fb377a7c4bcb351e63167554d',
+ 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@9c67b23020e2a0497cdd6aea48511c873a07d04c',
'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@1f33e234be4e2823c663d02b3baa3e7a7cfc33cb',
'src/third_party/findbugs': {
@@ -150,9 +150,9 @@
'condition': 'checkout_linux',
},
'src/third_party/freetype/src':
- 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@7482c98f1533d1b685113a060f4588f703a81b79',
+ 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@5b626281f1e6524dd87e3d5d6af795b39a8cc10b',
'src/third_party/harfbuzz-ng/src':
- 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@280366ba6af14fbcacbc49e6aa1c12d83e531ad1',
+ 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@6602cbb7062bf92e6824ae6bc0e5d3aad4b85939',
'src/third_party/google_benchmark/src': {
'url': 'https://chromium.googlesource.com/external/github.com/google/benchmark.git@e991355c02b93fe17713efe04cbc2e278e00fdbd',
},
@@ -170,9 +170,9 @@
'dep_type': 'cipd',
},
'src/third_party/googletest/src':
- 'https://chromium.googlesource.com/external/github.com/google/googletest.git@955c7f837efad184ec63e771c42542d37545eaef',
+ 'https://chromium.googlesource.com/external/github.com/google/googletest.git@159c9ad23e8b276e8c975bb8621c81d4df5fd863',
'src/third_party/icu': {
- 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@ece15d049f2d360721716089372e3749fb89e0f4',
+ 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@3f443830bd52d3aa5fab3c1aa2b6d0848bb5039d',
},
'src/third_party/jdk': {
'packages': [
@@ -214,11 +214,11 @@
'condition': 'checkout_android',
},
'src/third_party/perfetto':
- 'https://android.googlesource.com/platform/external/perfetto.git@8420673b4cf236574656e59f429b1c38d7029ba6',
+ 'https://android.googlesource.com/platform/external/perfetto.git@de98afcd4ade430e1e2f1a5f2bc9de53a20c92bd',
'src/third_party/libvpx/source/libvpx':
- 'https://chromium.googlesource.com/webm/libvpx.git@15a75b45304248f746634b43763c496322bf8968',
+ 'https://chromium.googlesource.com/webm/libvpx.git@65a1751e5b98bf7f1d21bcbfdef352af34fb205d',
'src/third_party/libyuv':
- 'https://chromium.googlesource.com/libyuv/libyuv.git@49ebc996aa8c4bdf89c1b5ea461eb677234c61cc',
+ 'https://chromium.googlesource.com/libyuv/libyuv.git@0896c34873e83ca3d1690286a94e278a81d0a760',
'src/third_party/lss': {
'url': 'https://chromium.googlesource.com/linux-syscall-support.git@92a65a8f5d705d1928874420c8d0d15bde8c89e5',
'condition': 'checkout_android or checkout_linux',
@@ -239,7 +239,7 @@
'packages': [
{
'package': 'chromium/third_party/r8',
- 'version': 'dvPOJ_8iAF6OHGO79d86VbJjyKj7Xn0SFxlVVC9LHdcC',
+ 'version': 'j4P6kTwiJeMkYRbaOqRCB-ZrYyISP0NrcyNNAd8MRM0C',
},
],
'condition': 'checkout_android',
@@ -264,14 +264,14 @@
'condition': 'checkout_android',
},
'src/third_party/usrsctp/usrsctplib':
- 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@bdf3dd3f284ebbd2a6fa16f12284d7ac8b3ad8b8',
+ 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@62d7d0c928c9a040dce96aa2f16c00e7e67d59cb',
# Dependency used by libjpeg-turbo.
'src/third_party/yasm/binaries': {
'url': 'https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881',
'condition': 'checkout_win',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@e3721e5cf9c0b510e25891d9b5915cbd67d607e2',
+ 'https://chromium.googlesource.com/chromium/src/tools@a27c09f45b144852f0f3762ff8fe2c2efaa9a538',
'src/third_party/accessibility_test_framework': {
'packages': [
@@ -370,7 +370,7 @@
'packages': [
{
'package': 'chromium/third_party/androidx',
- 'version': 'TnotTDnWGUJDh0mSOMrgnIwzbfWFiwo2NTtr2SlUJ0MC',
+ 'version': 'QRXHawrfyCC8nr_u3VCPoilYsqHO01yv1EiduoQUPcgC',
},
],
'condition': 'checkout_android',
@@ -475,15 +475,15 @@
'packages': [
{
'package': 'infra/tools/luci/isolate/${{platform}}',
- 'version': 'git_revision:7f42370cb3b75398bdb9ae0aabe215a70d40cd31',
+ 'version': 'git_revision:dc21267f89df3981e809fe9566591d6916ae758b',
},
{
'package': 'infra/tools/luci/isolated/${{platform}}',
- 'version': 'git_revision:7f42370cb3b75398bdb9ae0aabe215a70d40cd31',
+ 'version': 'git_revision:dc21267f89df3981e809fe9566591d6916ae758b',
},
{
'package': 'infra/tools/luci/swarming/${{platform}}',
- 'version': 'git_revision:7f42370cb3b75398bdb9ae0aabe215a70d40cd31',
+ 'version': 'git_revision:dc21267f89df3981e809fe9566591d6916ae758b',
},
],
'dep_type': 'cipd',
@@ -1291,7 +1291,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_auto_auto_common',
- 'version': 'version:2@0.10.cr0',
+ 'version': 'version:2@1.1.2.cr0',
},
],
'condition': 'checkout_android',
@@ -1412,7 +1412,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotation',
- 'version': 'version:2@2.7.1.cr0',
+ 'version': 'version:2@2.9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1423,7 +1423,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations',
- 'version': 'version:2@2.7.1.cr0',
+ 'version': 'version:2@2.9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1434,7 +1434,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_check_api',
- 'version': 'version:2@2.7.1.cr0',
+ 'version': 'version:2@2.9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1445,7 +1445,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_core',
- 'version': 'version:2@2.7.1.cr0',
+ 'version': 'version:2@2.9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1456,7 +1456,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_errorprone_error_prone_type_annotations',
- 'version': 'version:2@2.7.1.cr0',
+ 'version': 'version:2@2.9.0.cr0',
},
],
'condition': 'checkout_android',
@@ -1632,7 +1632,7 @@
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/com_google_guava_guava',
- 'version': 'version:2@30.1-jre.cr0',
+ 'version': 'version:2@30.1.1-jre.cr0',
},
],
'condition': 'checkout_android',
@@ -2024,11 +2024,11 @@
'dep_type': 'cipd',
},
- 'src/third_party/android_deps/libs/org_checkerframework_dataflow_shaded': {
+ 'src/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone': {
'packages': [
{
- 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_shaded',
- 'version': 'version:2@3.11.0.cr0',
+ 'package': 'chromium/third_party/android_deps/libs/org_checkerframework_dataflow_errorprone',
+ 'version': 'version:2@3.15.0.cr0',
},
],
'condition': 'checkout_android',
diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
index c3f257d..80481a3 100644
--- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc
+++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
@@ -921,13 +921,7 @@
TEST_F(AcmReceiverBitExactnessOldApi, 8kHzOutput) {
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "e0c966d7b8c36ff60167988fa35d33e0"
-// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
-// checksum.
-#if defined(WEBRTC_LINUX) && defined(NDEBUG)
- : "5af28619e3a3c606b2242c9a12f4f64e";
-#else
: "7d8f6b84abd1e57ec010a53bc2130652";
-#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "405a50f0bcb8827e20aa944299fc59f6"
: "0ed5830930f5527a01bbec0ba11f8541";
@@ -942,14 +936,7 @@
TEST_F(AcmReceiverBitExactnessOldApi, 16kHzOutput) {
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "a63c578e1195c8420f453962c6d8519c"
-
-// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
-// checksum.
-#if defined(WEBRTC_LINUX) && defined(NDEBUG)
- : "f788cc9200ac4a7d498d9081987808a3";
-#else
: "6bac83762c1306b932cd25a560155681";
-#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "58fd62a5c49ee513f9fa6fe7dbf62c97"
: "0509cf0672f543efb4b050e8cffefb1d";
@@ -964,13 +951,7 @@
TEST_F(AcmReceiverBitExactnessOldApi, 32kHzOutput) {
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "8775ce387f44dc5ff4a26da295d5ee7c"
-// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
-// checksum.
-#if defined(WEBRTC_LINUX) && defined(NDEBUG)
- : "5b84b2a179cb8533a8f9bcd19612e7f0";
-#else
: "e319222ca47733709f90fdf33c8574db";
-#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "04ce6a1dac5ffdd8438d804623d0132f"
: "39a4a7a1c455b35baeffb9fd193d7858";
@@ -985,13 +966,7 @@
TEST_F(AcmReceiverBitExactnessOldApi, 48kHzOutput) {
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "7a55700b7ca9aa60237db58b33e55606"
-// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
-// checksum.
-#if defined(WEBRTC_LINUX) && defined(NDEBUG)
- : "a2459749062f96297283cce4a8c7e6db";
-#else
: "57d1d316c88279f4f3da3511665069a9";
-#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "f59833d9b0924f4b0704707dd3589f80"
: "74cbe7345e2b6b45c1e455a5d1e921ca";
@@ -1080,13 +1055,7 @@
new rtc::RefCountedObject<ADFactory>);
std::string others_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "7a55700b7ca9aa60237db58b33e55606"
-// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
-// checksum.
-#if defined(WEBRTC_LINUX) && defined(NDEBUG)
- : "a2459749062f96297283cce4a8c7e6db";
-#else
: "57d1d316c88279f4f3da3511665069a9";
-#endif
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "f59833d9b0924f4b0704707dd3589f80"
: "74cbe7345e2b6b45c1e455a5d1e921ca";
@@ -1315,24 +1284,14 @@
TEST_F(AcmSenderBitExactnessOldApi, IsacWb30ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 480, 480));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
-#if defined(WEBRTC_WIN) && defined(_MSC_VER) && !defined(__clang__) && \
- defined(WEBRTC_ARCH_X86)
/*others=*/"2c9cb15d4ed55b5a0cadd04883bc73b0",
-#else
- /*others=*/"6f7f227f4e2ace7027257eecb7b17e08",
-#endif
/*win64=*/"9336a9b993cbd8a751f0e8958e66c89c",
/*android_arm32=*/"5c2eb46199994506236f68b2c8e51b0d",
/*android_arm64=*/"343f1f42be0607c61e6516aece424609",
/*android_arm64_clang=*/"2c9cb15d4ed55b5a0cadd04883bc73b0",
/*mac_arm64=*/"6f7f227f4e2ace7027257eecb7b17e08"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
-#if defined(WEBRTC_WIN) && defined(_MSC_VER) && !defined(__clang__) && \
- defined(WEBRTC_ARCH_X86)
/*others=*/"3c79f16f34218271f3dca4e2b1dfe1bb",
-#else
- /*others=*/"3fbb620556a08bcb88d9134e846bbb8e",
-#endif
/*win64=*/"d42cb5195463da26c8129bbfe73a22e6",
/*android_arm32=*/"83de248aea9c3c2bd680b6952401b4ca",
/*android_arm64=*/"3c79f16f34218271f3dca4e2b1dfe1bb",
@@ -1344,24 +1303,14 @@
TEST_F(AcmSenderBitExactnessOldApi, IsacWb60ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 960, 960));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
-#if defined(WEBRTC_WIN) && defined(_MSC_VER) && !defined(__clang__) && \
- defined(WEBRTC_ARCH_X86)
/*others=*/"1ad29139a04782a33daad8c2b9b35875",
-#else
- /*others=*/"8b4377f3048d946d69b771c1e5fa8839",
-#endif
/*win64=*/"14d63c5f08127d280e722e3191b73bdd",
/*android_arm32=*/"9a81e467eb1485f84aca796f8ea65011",
/*android_arm64=*/"ef75e900e6f375e3061163c53fd09a63",
/*android_arm64_clang=*/"1ad29139a04782a33daad8c2b9b35875",
/*mac_arm64=*/"8b4377f3048d946d69b771c1e5fa8839"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
-#if defined(WEBRTC_WIN) && defined(_MSC_VER) && !defined(__clang__) && \
- defined(WEBRTC_ARCH_X86)
/*others=*/"9e0a0ab743ad987b55b8e14802769c56",
-#else
- /*others=*/"080f341c0d498e7a60522084bf8264ae",
-#endif
/*win64=*/"ebe04a819d3a9d83a83a17f271e1139a",
/*android_arm32=*/"97aeef98553b5a4b5a68f8b716e8eaf0",
/*android_arm64=*/"9e0a0ab743ad987b55b8e14802769c56",
@@ -1381,26 +1330,12 @@
TEST_F(AcmSenderBitExactnessOldApi, MAYBE_IsacSwb30ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 32000, 1, 104, 960, 960));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
-// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
-// checksum.
-#if defined(WEBRTC_LINUX) && defined(WEBRTC_ARCH_X86)
- /*others=*/"521a04159bb991fa2f32f550d5184f60",
-#elif defined(WEBRTC_WIN) && defined(_MSC_VER) && !defined(__clang__) && \
- defined(WEBRTC_ARCH_X86)
/*others=*/"5683b58da0fbf2063c7adc2e6bfb3fb8",
-#else
- /*others=*/"c1858ba5d734df6fe52e715eb1b25f31",
-#endif
/*win64=*/"2b3c387d06f00b7b7aad4c9be56fb83d", "android_arm32_audio",
"android_arm64_audio", "android_arm64_clang_audio",
/*mac_arm64=*/"c1858ba5d734df6fe52e715eb1b25f31"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
-#if defined(WEBRTC_WIN) && defined(_MSC_VER) && !defined(__clang__) && \
- defined(WEBRTC_ARCH_X86)
/*others=*/"ce86106a93419aefb063097108ec94ab",
-#else
- /*others=*/"127e24a1005ac80394b1f88d0cbc72a8",
-#endif
/*win64=*/"bcc2041e7744c7ebd9f701866856849c", "android_arm32_payload",
"android_arm64_payload", "android_arm64_clang_payload",
/*mac_arm64=*/"127e24a1005ac80394b1f88d0cbc72a8"),
diff --git a/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc
index ac0e48e..e1e58f9 100644
--- a/modules/audio_coding/neteq/audio_decoder_unittest.cc
+++ b/modules/audio_coding/neteq/audio_decoder_unittest.cc
@@ -598,7 +598,7 @@
#elif defined(WEBRTC_IOS) && defined(WEBRTC_ARCH_X86_64)
static const int kEncodedBytes = 671;
#else
- static const int kEncodedBytes = 687;
+ static const int kEncodedBytes = 671;
#endif
EncodeDecodeTest(kEncodedBytes, tolerance, mse, delay);
ReInitTest();
diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
index 5ce6b89..cbb1b14 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_unittest.cc
@@ -83,25 +83,13 @@
webrtc::test::ResourcePath("audio_coding/neteq_universal_new", "rtp");
const std::string output_checksum = PlatformChecksum(
-// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
-// checksum.
-#if defined(WEBRTC_LINUX) && defined(NDEBUG) && defined(WEBRTC_ARCH_X86)
- "8d9c177b7f2f9398c0944a851edffae214de2c56",
-#else
"6c35140ce4d75874bdd60aa1872400b05fd05ca2",
-#endif
"ab451bb8301d9a92fbf4de91556b56f1ea38b4ce", "not used",
"6c35140ce4d75874bdd60aa1872400b05fd05ca2",
"64b46bb3c1165537a880ae8404afce2efba456c0");
const std::string network_stats_checksum = PlatformChecksum(
-// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
-// checksum.
-#if defined(WEBRTC_LINUX) && defined(NDEBUG) && defined(WEBRTC_ARCH_X86)
- "8cc08e3cd6801dcba4fcc15eb4036c19296a140d",
-#else
"90594d85fa31d3d9584d79293bf7aa4ee55ed751",
-#endif
"77b9c3640b81aff6a38d69d07dd782d39c15321d", "not used",
"90594d85fa31d3d9584d79293bf7aa4ee55ed751",
"90594d85fa31d3d9584d79293bf7aa4ee55ed751");
