Reland "Roll chromium_revision de0d050e64..42d795c24f (908789:908899)"
This is a reland of e369928e040623340e04390ce933e5dc491af22f
Original change's description:
> Roll chromium_revision de0d050e64..42d795c24f (908789:908899)
>
> Change log: https://chromium.googlesource.com/chromium/src/+log/de0d050e64..42d795c24f
> Full diff: https://chromium.googlesource.com/chromium/src/+/de0d050e64..42d795c24f
>
> Changed dependencies
> * src/base: https://chromium.googlesource.com/chromium/src/base/+log/f14f1b7600..6551b66fbf
> * src/build: https://chromium.googlesource.com/chromium/src/build/+log/e360729c13..496f4dc82b
> * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/2965e1969a..fda9d90178
> * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/36299f559a..cb835b4820
> * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/e99cff4446..aec4ec11c2
> * src/third_party/androidx: 6YnvOFZqQbSfmq9Bknb9CSKuND84c-TqnEATwNlvhqwC..iS9uLbt1ks96lnB9FgzCbsDit0AaQS7PqWyWdVJ3mggC
> * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/0a4dd4181a..cc487710bb
> * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/00e6f338d0..7d0822e5b1
> * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/5219d6859a..667c51bbca
> DEPS diff: https://chromium.googlesource.com/chromium/src/+/de0d050e64..42d795c24f/DEPS
>
> Clang version changed llvmorg-13-init-15561-gf98ed74f:llvmorg-14-init-591-g7d9d926a
> Details: https://chromium.googlesource.com/chromium/src/+/de0d050e64..42d795c24f/tools/clang/scripts/update.py
>
> BUG=None
>
> Change-Id: Ibc203c4808885594a4316d8ce0e0a82bacebe51b
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227770
> Commit-Queue: Artem Titov <titovartem@webrtc.org>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#34658}
Bug: None
Change-Id: Ibc843ef6e4e50d9d62b6b3550d5cde6eaebc02e6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227773
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34662}
diff --git a/DEPS b/DEPS
index d16bb59..0709946 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': 'de0d050e64117c1c433f79559bcb9e04e5c44329',
+ 'chromium_revision': '42d795c24ff3a698e7857cd1262147b43771f874',
# 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@f14f1b760096aa611c9023a73109908d70148c7a',
+ 'https://chromium.googlesource.com/chromium/src/base@6551b66fbf30b73aeeb177985fedaa6304280a41',
'src/build':
- 'https://chromium.googlesource.com/chromium/src/build@e360729c132be1e63412960efcc225a1ca78678a',
+ 'https://chromium.googlesource.com/chromium/src/build@496f4dc82bab8dd113cd3c53b9d2d2a412fd3d26',
'src/buildtools':
'https://chromium.googlesource.com/chromium/src/buildtools@37dc929ecb351687006a61744b116cda601753d7',
# 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@2965e1969a12eec936b74c167d6e82a5d80e4ee5',
+ 'url': 'https://chromium.googlesource.com/chromium/src/ios@fda9d901781807dd82b1cf3480c2a1f9005ed603',
'condition': 'checkout_ios',
},
'src/testing':
- 'https://chromium.googlesource.com/chromium/src/testing@36299f559aeec6be1a807522ca3778d261a4b353',
+ 'https://chromium.googlesource.com/chromium/src/testing@cb835b4820f579b757b9d0c5fcdc226c667440bf',
'src/third_party':
- 'https://chromium.googlesource.com/chromium/src/third_party@e99cff4446a945cb1913398731f9f765e028eb99',
+ 'https://chromium.googlesource.com/chromium/src/third_party@aec4ec11c2d344c53ff5722261061eecb443c83e',
'src/buildtools/linux64': {
'packages': [
@@ -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@0a4dd4181ae2d3f2b77bb9f4ea4451d9209c8159',
+ 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@cc487710bb02ca3fc078e0495a12e6445bf80131',
'src/third_party/ffmpeg':
'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@14e1145ddd3d5f3ba478a19b4ae8822679d83a6c',
'src/third_party/findbugs': {
@@ -214,7 +214,7 @@
'condition': 'checkout_android',
},
'src/third_party/perfetto':
- 'https://android.googlesource.com/platform/external/perfetto.git@00e6f338d036b5d1ad547b979b612ec008fe3165',
+ 'https://android.googlesource.com/platform/external/perfetto.git@7d0822e5b1903542d5712673481fc0747ca34bb7',
'src/third_party/libvpx/source/libvpx':
'https://chromium.googlesource.com/webm/libvpx.git@977e77006ee175f23beb231d0de2968f5c9d17b0',
'src/third_party/libyuv':
@@ -271,7 +271,7 @@
'condition': 'checkout_win',
},
'src/tools':
- 'https://chromium.googlesource.com/chromium/src/tools@5219d6859a279d1d8f2f49784741eb48d5925da7',
+ 'https://chromium.googlesource.com/chromium/src/tools@667c51bbca1f52f2d293751b1419c959c7db9a63',
'src/tools/swarming_client':
'https://chromium.googlesource.com/infra/luci/client-py.git@a32a1607f6093d338f756c7e7c7b4333b0c50c9c',
@@ -372,7 +372,7 @@
'packages': [
{
'package': 'chromium/third_party/androidx',
- 'version': '6YnvOFZqQbSfmq9Bknb9CSKuND84c-TqnEATwNlvhqwC',
+ 'version': 'iS9uLbt1ks96lnB9FgzCbsDit0AaQS7PqWyWdVJ3mggC',
},
],
'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 a0a8854..edf78ca 100644
--- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc
+++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
@@ -931,12 +931,12 @@
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "405a50f0bcb8827e20aa944299fc59f6"
: "0ed5830930f5527a01bbec0ba11f8541";
- Run(8000,
- PlatformChecksum(others_checksum_reference, win64_checksum_reference,
- "b892ed69c38b21b16c132ec2ce03aa7b",
- "4598140b5e4f7ee66c5adad609e65a3e",
- "5fec8d770778ef7969ec98c56d9eb10f",
- "636efe6d0a148f22c5383f356da3deac"));
+ Run(8000, PlatformChecksum(
+ others_checksum_reference, win64_checksum_reference,
+ /*android_arm32=*/"b892ed69c38b21b16c132ec2ce03aa7b",
+ /*android_arm64=*/"4598140b5e4f7ee66c5adad609e65a3e",
+ /*android_arm64_clang=*/"5fec8d770778ef7969ec98c56d9eb10f",
+ /*mac_arm64=*/"636efe6d0a148f22c5383f356da3deac"));
}
TEST_F(AcmReceiverBitExactnessOldApi, 16kHzOutput) {
@@ -953,12 +953,12 @@
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "58fd62a5c49ee513f9fa6fe7dbf62c97"
: "0509cf0672f543efb4b050e8cffefb1d";
- Run(16000,
- PlatformChecksum(others_checksum_reference, win64_checksum_reference,
- "3cea9abbeabbdea9a79719941b241af5",
- "f2aad418af974a3b1694d5ae5cc2c3c7",
- "9d4b92c31c00e321a4cff29ad002d6a2",
- "1e2d1b482fdc924f79a838503ee7ead5"));
+ Run(16000, PlatformChecksum(
+ others_checksum_reference, win64_checksum_reference,
+ /*android_arm32=*/"3cea9abbeabbdea9a79719941b241af5",
+ /*android_arm64=*/"f2aad418af974a3b1694d5ae5cc2c3c7",
+ /*android_arm64_clang=*/"9d4b92c31c00e321a4cff29ad002d6a2",
+ /*mac_arm64=*/"1e2d1b482fdc924f79a838503ee7ead5"));
}
TEST_F(AcmReceiverBitExactnessOldApi, 32kHzOutput) {
@@ -974,12 +974,12 @@
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "04ce6a1dac5ffdd8438d804623d0132f"
: "39a4a7a1c455b35baeffb9fd193d7858";
- Run(32000,
- PlatformChecksum(others_checksum_reference, win64_checksum_reference,
- "4df55b3b62bcbf4328786d474ae87f61",
- "100869c8dcde51346c2073e52a272d98",
- "ff58d3153d2780a3df6bc2068844cb2d",
- "51788e9784a10ae14a030f075a039205"));
+ Run(32000, PlatformChecksum(
+ others_checksum_reference, win64_checksum_reference,
+ /*android_arm32=*/"4df55b3b62bcbf4328786d474ae87f61",
+ /*android_arm64=*/"100869c8dcde51346c2073e52a272d98",
+ /*android_arm64_clang=*/"ff58d3153d2780a3df6bc2068844cb2d",
+ /*mac_arm64=*/"51788e9784a10ae14a030f075a039205"));
}
TEST_F(AcmReceiverBitExactnessOldApi, 48kHzOutput) {
@@ -995,12 +995,12 @@
std::string win64_checksum_reference =
GetCPUInfo(kAVX2) != 0 ? "f59833d9b0924f4b0704707dd3589f80"
: "74cbe7345e2b6b45c1e455a5d1e921ca";
- Run(48000,
- PlatformChecksum(others_checksum_reference, win64_checksum_reference,
- "f52bc7bf0f499c9da25932fdf176c4ec",
- "bd44bf97e7899186532f91235cef444d",
- "364d403dae55d73cd69e6dbd6b723a4d",
- "71bc5c15a151400517c2119d1602ee9f"));
+ Run(48000, PlatformChecksum(
+ others_checksum_reference, win64_checksum_reference,
+ /*android_arm32=*/"f52bc7bf0f499c9da25932fdf176c4ec",
+ /*android_arm64=*/"bd44bf97e7899186532f91235cef444d",
+ /*android_arm64_clang=*/"364d403dae55d73cd69e6dbd6b723a4d",
+ /*mac_arm64=*/"71bc5c15a151400517c2119d1602ee9f"));
}
TEST_F(AcmReceiverBitExactnessOldApi, 48kHzOutputExternalDecoder) {
@@ -1091,11 +1091,12 @@
GetCPUInfo(kAVX2) != 0 ? "f59833d9b0924f4b0704707dd3589f80"
: "74cbe7345e2b6b45c1e455a5d1e921ca";
Run(48000,
- PlatformChecksum(others_checksum_reference, win64_checksum_reference,
- "f52bc7bf0f499c9da25932fdf176c4ec",
- "bd44bf97e7899186532f91235cef444d",
- "364d403dae55d73cd69e6dbd6b723a4d",
- "71bc5c15a151400517c2119d1602ee9f"),
+ PlatformChecksum(
+ others_checksum_reference, win64_checksum_reference,
+ /*android_arm32=*/"f52bc7bf0f499c9da25932fdf176c4ec",
+ /*android_arm64=*/"bd44bf97e7899186532f91235cef444d",
+ /*android_arm64_clang=*/"364d403dae55d73cd69e6dbd6b723a4d",
+ /*mac_arm64=*/"71bc5c15a151400517c2119d1602ee9f"),
factory, [](AudioCodingModule* acm) {
acm->SetReceiveCodecs({{0, {"MockPCMu", 8000, 1}},
{103, {"ISAC", 16000, 1}},
@@ -1308,47 +1309,70 @@
class AcmSenderBitExactnessNewApi : public AcmSenderBitExactnessOldApi {};
-#if defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)
+// Run bit exactness tests only for release builds.
+#if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) && \
+ defined(NDEBUG)
TEST_F(AcmSenderBitExactnessOldApi, IsacWb30ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 480, 480));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "2c9cb15d4ed55b5a0cadd04883bc73b0",
- "9336a9b993cbd8a751f0e8958e66c89c",
- "5c2eb46199994506236f68b2c8e51b0d",
- "343f1f42be0607c61e6516aece424609",
- "2c9cb15d4ed55b5a0cadd04883bc73b0",
- "2c9cb15d4ed55b5a0cadd04883bc73b0"),
+#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=*/"2c9cb15d4ed55b5a0cadd04883bc73b0"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "3c79f16f34218271f3dca4e2b1dfe1bb",
- "d42cb5195463da26c8129bbfe73a22e6",
- "83de248aea9c3c2bd680b6952401b4ca",
- "3c79f16f34218271f3dca4e2b1dfe1bb",
- "3c79f16f34218271f3dca4e2b1dfe1bb",
- "3c79f16f34218271f3dca4e2b1dfe1bb"),
+#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",
+ /*android_arm64_clang=*/"3c79f16f34218271f3dca4e2b1dfe1bb",
+ /*mac_arm64=*/"3c79f16f34218271f3dca4e2b1dfe1bb"),
33, test::AcmReceiveTestOldApi::kMonoOutput);
}
TEST_F(AcmSenderBitExactnessOldApi, IsacWb60ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("ISAC", 16000, 1, 103, 960, 960));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "1ad29139a04782a33daad8c2b9b35875",
- "14d63c5f08127d280e722e3191b73bdd",
- "9a81e467eb1485f84aca796f8ea65011",
- "ef75e900e6f375e3061163c53fd09a63",
- "1ad29139a04782a33daad8c2b9b35875",
- "1ad29139a04782a33daad8c2b9b35875"),
+#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=*/"1ad29139a04782a33daad8c2b9b35875"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "9e0a0ab743ad987b55b8e14802769c56",
- "ebe04a819d3a9d83a83a17f271e1139a",
- "97aeef98553b5a4b5a68f8b716e8eaf0",
- "9e0a0ab743ad987b55b8e14802769c56",
- "9e0a0ab743ad987b55b8e14802769c56",
- "9e0a0ab743ad987b55b8e14802769c56"),
+#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",
+ /*android_arm64_clang=*/"9e0a0ab743ad987b55b8e14802769c56",
+ /*mac_arm64=*/"9e0a0ab743ad987b55b8e14802769c56"),
16, test::AcmReceiveTestOldApi::kMonoOutput);
}
#endif
-#if defined(WEBRTC_ANDROID)
+// Run bit exactness test only for release build.
+#if defined(WEBRTC_ANDROID) || !defined(NDEBUG)
#define MAYBE_IsacSwb30ms DISABLED_IsacSwb30ms
#else
#define MAYBE_IsacSwb30ms IsacSwb30ms
@@ -1359,19 +1383,27 @@
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
// TODO(bugs.webrtc.org/12941): Linux x86 optimized builds have a different
// checksum.
-#if defined(WEBRTC_LINUX) && defined(NDEBUG) && defined(WEBRTC_ARCH_X86)
- "13d4d2a4c9e8e94a4b74a176e4bf7cc4",
+#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
- "5683b58da0fbf2063c7adc2e6bfb3fb8",
+ /*others=*/"c1858ba5d734df6fe52e715eb1b25f31",
#endif
- "2b3c387d06f00b7b7aad4c9be56fb83d", "android_arm32_audio",
+ /*win64=*/"2b3c387d06f00b7b7aad4c9be56fb83d", "android_arm32_audio",
"android_arm64_audio", "android_arm64_clang_audio",
- "5683b58da0fbf2063c7adc2e6bfb3fb8"),
+ /*mac_arm64=*/"5683b58da0fbf2063c7adc2e6bfb3fb8"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "ce86106a93419aefb063097108ec94ab",
- "bcc2041e7744c7ebd9f701866856849c", "android_arm32_payload",
+#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",
- "ce86106a93419aefb063097108ec94ab"),
+ /*mac_arm64=*/"ce86106a93419aefb063097108ec94ab"),
33, test::AcmReceiveTestOldApi::kMonoOutput);
}
#endif
@@ -1445,15 +1477,15 @@
TEST_F(AcmSenderBitExactnessOldApi, MAYBE_Ilbc_30ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("ILBC", 8000, 1, 102, 240, 240));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "7b6ec10910debd9af08011d3ed5249f7",
- "7b6ec10910debd9af08011d3ed5249f7", "android_arm32_audio",
+ /*others=*/"7b6ec10910debd9af08011d3ed5249f7",
+ /*win64=*/"7b6ec10910debd9af08011d3ed5249f7", "android_arm32_audio",
"android_arm64_audio", "android_arm64_clang_audio",
- "7b6ec10910debd9af08011d3ed5249f7"),
+ /*mac_arm64=*/"7b6ec10910debd9af08011d3ed5249f7"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "cfae2e9f6aba96e145f2bcdd5050ce78",
- "cfae2e9f6aba96e145f2bcdd5050ce78", "android_arm32_payload",
+ /*others=*/"cfae2e9f6aba96e145f2bcdd5050ce78",
+ /*win64=*/"cfae2e9f6aba96e145f2bcdd5050ce78", "android_arm32_payload",
"android_arm64_payload", "android_arm64_clang_payload",
- "cfae2e9f6aba96e145f2bcdd5050ce78"),
+ /*mac_arm64=*/"cfae2e9f6aba96e145f2bcdd5050ce78"),
33, test::AcmReceiveTestOldApi::kMonoOutput);
}
#endif
@@ -1466,15 +1498,15 @@
TEST_F(AcmSenderBitExactnessOldApi, MAYBE_G722_20ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("G722", 16000, 1, 9, 320, 160));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "e99c89be49a46325d03c0d990c292d68",
- "e99c89be49a46325d03c0d990c292d68", "android_arm32_audio",
+ /*others=*/"e99c89be49a46325d03c0d990c292d68",
+ /*win64=*/"e99c89be49a46325d03c0d990c292d68", "android_arm32_audio",
"android_arm64_audio", "android_arm64_clang_audio",
- "e99c89be49a46325d03c0d990c292d68"),
+ /*mac_arm64=*/"e99c89be49a46325d03c0d990c292d68"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "fc68a87e1380614e658087cb35d5ca10",
- "fc68a87e1380614e658087cb35d5ca10", "android_arm32_payload",
+ /*others=*/"fc68a87e1380614e658087cb35d5ca10",
+ /*win64=*/"fc68a87e1380614e658087cb35d5ca10", "android_arm32_payload",
"android_arm64_payload", "android_arm64_clang_payload",
- "fc68a87e1380614e658087cb35d5ca10"),
+ /*mac_arm64=*/"fc68a87e1380614e658087cb35d5ca10"),
50, test::AcmReceiveTestOldApi::kMonoOutput);
}
@@ -1486,15 +1518,15 @@
TEST_F(AcmSenderBitExactnessOldApi, MAYBE_G722_stereo_20ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("G722", 16000, 2, 119, 320, 160));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "e280aed283e499d37091b481ca094807",
- "e280aed283e499d37091b481ca094807", "android_arm32_audio",
+ /*others=*/"e280aed283e499d37091b481ca094807",
+ /*win64=*/"e280aed283e499d37091b481ca094807", "android_arm32_audio",
"android_arm64_audio", "android_arm64_clang_audio",
- "e280aed283e499d37091b481ca094807"),
+ /*mac_arm64=*/"e280aed283e499d37091b481ca094807"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "66516152eeaa1e650ad94ff85f668dac",
- "66516152eeaa1e650ad94ff85f668dac", "android_arm32_payload",
+ /*others=*/"66516152eeaa1e650ad94ff85f668dac",
+ /*win64=*/"66516152eeaa1e650ad94ff85f668dac", "android_arm32_payload",
"android_arm64_payload", "android_arm64_clang_payload",
- "66516152eeaa1e650ad94ff85f668dac"),
+ /*mac_arm64=*/"66516152eeaa1e650ad94ff85f668dac"),
50, test::AcmReceiveTestOldApi::kStereoOutput);
}
@@ -1509,19 +1541,19 @@
// Common checksums.
const std::string audio_checksum =
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- audio_maybe_sse,
- audio_maybe_sse,
- "6fcceb83acf427730570bc13eeac920c",
- "fd96f15d547c4e155daeeef4253b174e",
- "fd96f15d547c4e155daeeef4253b174e",
+ /*others=*/audio_maybe_sse,
+ /*win64=*/audio_maybe_sse,
+ /*android_arm32=*/"6fcceb83acf427730570bc13eeac920c",
+ /*android_arm64=*/"fd96f15d547c4e155daeeef4253b174e",
+ /*android_arm64_clang=*/"fd96f15d547c4e155daeeef4253b174e",
"Mac_arm64_checksum_placeholder");
const std::string payload_checksum =
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- payload_maybe_sse,
- payload_maybe_sse,
- "4bd846d0aa5656ecd5dfd85701a1b78c",
- "7efbfc9f8e3b4b2933ae2d01ab919028",
- "7efbfc9f8e3b4b2933ae2d01ab919028",
+ /*others=*/payload_maybe_sse,
+ /*win64=*/payload_maybe_sse,
+ /*android_arm32=*/"4bd846d0aa5656ecd5dfd85701a1b78c",
+ /*android_arm64=*/"7efbfc9f8e3b4b2933ae2d01ab919028",
+ /*android_arm64_clang=*/"7efbfc9f8e3b4b2933ae2d01ab919028",
"Mac_arm64_checksum_placeholder");
} // namespace
@@ -1579,16 +1611,22 @@
// Set up an EXTERNAL DECODER to parse 4 channels.
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum( // audio checksum
- "audio checksum check downstream|8051617907766bec5f4e4a4f7c6d5291",
- "8051617907766bec5f4e4a4f7c6d5291",
- "6183752a62dc1368f959eb3a8c93b846", "android arm64 audio checksum",
- "48bf1f3ca0b72f3c9cdfbe79956122b1", "Mac_arm64_checksum_placeholder"),
+ /*others=*/"audio checksum check "
+ "downstream|8051617907766bec5f4e4a4f7c6d5291",
+ /*win64=*/"8051617907766bec5f4e4a4f7c6d5291",
+ /*android_arm32=*/"6183752a62dc1368f959eb3a8c93b846",
+ "android arm64 audio checksum",
+ /*android_arm64_clang=*/"48bf1f3ca0b72f3c9cdfbe79956122b1",
+ "Mac_arm64_checksum_placeholder"),
// payload_checksum,
AcmReceiverBitExactnessOldApi::PlatformChecksum( // payload checksum
- "payload checksum check downstream|b09c52e44b2bdd9a0809e3a5b1623a76",
- "b09c52e44b2bdd9a0809e3a5b1623a76",
- "2ea535ef60f7d0c9d89e3002d4c2124f", "android arm64 payload checksum",
- "e87995a80f50a0a735a230ca8b04a67d", "Mac_arm64_checksum_placeholder"),
+ /*others=*/"payload checksum check "
+ "downstream|b09c52e44b2bdd9a0809e3a5b1623a76",
+ /*win64=*/"b09c52e44b2bdd9a0809e3a5b1623a76",
+ /*android_arm32=*/"2ea535ef60f7d0c9d89e3002d4c2124f",
+ "android arm64 payload checksum",
+ /*android_arm64_clang=*/"e87995a80f50a0a735a230ca8b04a67d",
+ "Mac_arm64_checksum_placeholder"),
50, test::AcmReceiveTestOldApi::kQuadOutput, decoder_factory);
}
@@ -1609,14 +1647,19 @@
"b38b5584cfa7b6999b2e8e996c950c88"
"|eb0752ce1b6f2436fefc2e19bd084fb5";
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- audio_maybe_sse, audio_maybe_sse, "f1cefe107ffdced7694d7f735342adf3",
- "3b1bfe5dd8ed16ee5b04b93a5b5e7e48",
- "3b1bfe5dd8ed16ee5b04b93a5b5e7e48", "Mac_arm64_checksum_placeholder"),
+ /*others=*/audio_maybe_sse,
+ /*win64=*/audio_maybe_sse,
+ /*android_arm32=*/"f1cefe107ffdced7694d7f735342adf3",
+ /*android_arm64=*/"3b1bfe5dd8ed16ee5b04b93a5b5e7e48",
+ /*android_arm64_clang=*/"3b1bfe5dd8ed16ee5b04b93a5b5e7e48",
+ "Mac_arm64_checksum_placeholder"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- payload_maybe_sse, payload_maybe_sse,
- "5e79a2f51c633fe145b6c10ae198d1aa",
- "e730050cb304d54d853fd285ab0424fa",
- "e730050cb304d54d853fd285ab0424fa", "Mac_arm64_checksum_placeholder"),
+ /*others=*/payload_maybe_sse,
+ /*win64=*/payload_maybe_sse,
+ /*android_arm32=*/"5e79a2f51c633fe145b6c10ae198d1aa",
+ /*android_arm64=*/"e730050cb304d54d853fd285ab0424fa",
+ /*android_arm64_clang=*/"e730050cb304d54d853fd285ab0424fa",
+ "Mac_arm64_checksum_placeholder"),
50, test::AcmReceiveTestOldApi::kStereoOutput);
}
diff --git a/modules/audio_coding/codecs/isac/isac_webrtc_api_test.cc b/modules/audio_coding/codecs/isac/isac_webrtc_api_test.cc
index 40381d8..a3badcf 100644
--- a/modules/audio_coding/codecs/isac/isac_webrtc_api_test.cc
+++ b/modules/audio_coding/codecs/isac/isac_webrtc_api_test.cc
@@ -206,7 +206,7 @@
// Inverse of the duration of `kNumFrames` 10 ms frames (unit: seconds^-1).
constexpr float kAudioDurationInv = 100.f / kNumFrames;
const int measured_bitrate_bps = 8 * num_bytes * kAudioDurationInv;
- EXPECT_LT(measured_bitrate_bps, bitrate_bps + 2000); // Max 2 kbps extra.
+ EXPECT_LT(measured_bitrate_bps, bitrate_bps + 2250); // Max 2250 bps extra.
}
}
diff --git a/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc
index 66b99b4..e1750ab 100644
--- a/modules/audio_coding/neteq/audio_decoder_unittest.cc
+++ b/modules/audio_coding/neteq/audio_decoder_unittest.cc
@@ -30,6 +30,7 @@
#include "modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h"
#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
#include "modules/audio_coding/neteq/tools/resample_input_audio_file.h"
+#include "rtc_base/system/arch.h"
#include "test/gtest.h"
#include "test/testsupport/file_utils.h"
@@ -580,6 +581,8 @@
56001 + overhead_rate));
}
+// Run bit exactness test only for release builds.
+#if defined(NDEBUG)
TEST_F(AudioDecoderIsacFixTest, EncodeDecode) {
int tolerance = 11034;
double mse = 3.46e6;
@@ -590,13 +593,18 @@
static const int kEncodedBytes = 673;
#elif defined(WEBRTC_MAC) && defined(WEBRTC_ARCH_ARM64) // M1 Mac
static const int kEncodedBytes = 673;
-#else
+#elif defined(WEBRTC_WIN) && defined(_MSC_VER) && !defined(__clang__)
static const int kEncodedBytes = 671;
+#elif defined(WEBRTC_IOS) && defined(WEBRTC_ARCH_X86_64)
+ static const int kEncodedBytes = 671;
+#else
+ static const int kEncodedBytes = 687;
#endif
EncodeDecodeTest(kEncodedBytes, tolerance, mse, delay);
ReInitTest();
EXPECT_FALSE(decoder_->HasDecodePlc());
}
+#endif
TEST_F(AudioDecoderIsacFixTest, SetTargetBitrate) {
const int overhead_rate =
