Revert "Roll "Enable SSE, SSE2, and run-time detected SSE4.1 for libopus.""
This reverts commit 466620b326c5743d9e3ce0d5af967fd977c5cf38.
Reason for revert: Break downstream clients which are still expecting the previous references for NetEqDecodingTest.TestOpusBitExactness.
Original change's description:
> Roll "Enable SSE, SSE2, and run-time detected SSE4.1 for libopus."
>
> We manually roll third_party since we need to update impacted tests,
> namely bit-exact comparison of expected neteq_opus results.
> They have changed due to SSE optimization enabled here:
> https://chromium.googlesource.com/chromium/src/+/85d355e530ff0d3d5450afbc6a955cd7c3c71c6d
>
> For consistency sake roll_deps has been invoked:
>
> Roll chromium_revision db720b4ab9..ae94013397 (606025:606579)
>
> Change log: https://chromium.googlesource.com/chromium/src/+log/db720b4ab9..ae94013397
> Full diff: https://chromium.googlesource.com/chromium/src/+/db720b4ab9..ae94013397
>
> Changed dependencies
> * src/base: https://chromium.googlesource.com/chromium/src/base/+log/fee916f36b..f428263956
> * src/build: https://chromium.googlesource.com/chromium/src/build/+log/02b0a894b0..3f61809684
> * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/95aadfb43f..fb48cd850c
> * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/03b25bebb5..f6a2832441
> * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/360db5b8aa..8209b47661
> * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/dd412c428a..384d0eaf19
> * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/2e722b007d..f04a3a61ad
> * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/4d2d5b4bbe..edcefdcf7d
> * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/f56830ed40..fb0d66d04c
> * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/a8e76f0ca5..f8ace9b670
> DEPS diff: https://chromium.googlesource.com/chromium/src/+/db720b4ab9..ae94013397/DEPS
>
> Clang version changed 344066:346388
> Details: https://chromium.googlesource.com/chromium/src/+/db720b4ab9..ae94013397/tools/clang/scripts/update.py
>
> Bug: webrtc:9530
> Change-Id: I8a016c5834c4f05fc17e3a84a5e139eeaeaee510
> Reviewed-on: https://webrtc-review.googlesource.com/c/110040
> Commit-Queue: Yves Gerey <yvesg@webrtc.org>
> Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25588}
TBR=phoglund@webrtc.org,ivoc@webrtc.org,yvesg@webrtc.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:9530
Change-Id: I01549abdcfbcad70881ff9aeee913df68d0f0052
Reviewed-on: https://webrtc-review.googlesource.com/c/110602
Reviewed-by: Yves Gerey <yvesg@google.com>
Commit-Queue: Yves Gerey <yvesg@google.com>
Cr-Commit-Position: refs/heads/master@{#25591}diff --git a/DEPS b/DEPS
index d1c0751..40691f1 100644
--- a/DEPS
+++ b/DEPS
@@ -7,7 +7,7 @@
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
- 'chromium_revision': 'ae94013397d9409b164e6f66f946c6927a2fe9c3',
+ 'chromium_revision': 'db720b4ab910a13e6cd512a1f787142198d182c1',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@@ -16,7 +16,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
- 'boringssl_revision': '384d0eaf1930af1ebc47eda751f0c78dfcba1c03',
+ 'boringssl_revision': 'dd412c428ad7c2a60ae4709dfbad6301e499dcb8',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling lss
# and whatever else without interference from each other.
@@ -24,7 +24,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
- 'catapult_revision': 'f04a3a61ad90b65450499cfca9ae2f7b57054d03',
+ 'catapult_revision': '2e722b007d34e61aad0b5f13d74e5a5d9616c1a0',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other.
@@ -32,7 +32,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other.
- 'freetype_revision': 'fb0d66d04c4dd8d7f9604af1a6001b2737cb5098',
+ 'freetype_revision': 'f56830ed406f90f6f53ee6367f2068a0f27bf90b',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling HarfBuzz
# and whatever else without interference from each other.
@@ -42,9 +42,9 @@
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
- Var('chromium_git') + '/chromium/src/base' + '@' + 'f4282639561d7c8ab547eb5e977881e9f4829585',
+ Var('chromium_git') + '/chromium/src/base' + '@' + 'fee916f36bdc138c5bb49056ce183c997e20d89a',
'src/build':
- Var('chromium_git') + '/chromium/src/build' + '@' + '3f61809684e8c546f949d5bbeb070f76a11f6924',
+ Var('chromium_git') + '/chromium/src/build' + '@' + '9f8abf9183b5dabc14a80a0dc8849f4439121c8b',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '13a00f110ef910a25763346d6538b60f12845656',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@@ -54,13 +54,13 @@
'condition': 'checkout_android',
},
'src/ios': {
- 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'fb48cd850c88c4d9ee315072fbd01a62c67eacad',
+ 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '95aadfb43ffbb7bcdb6af9eb6ab6230f328bcc28',
'condition': 'checkout_ios',
},
'src/testing':
- Var('chromium_git') + '/chromium/src/testing' + '@' + 'f6a2832441801ba78267fde9ca7a5d4f14bb8f1c',
+ Var('chromium_git') + '/chromium/src/testing' + '@' + '03b25bebb5d2f4f239d78fd1db79ffa1cf8e6b12',
'src/third_party':
- Var('chromium_git') + '/chromium/src/third_party' + '@' + '8209b4766174d562616a9b6b18d8af2780b973c7',
+ Var('chromium_git') + '/chromium/src/third_party' + '@' + '60e74a707b8214fb63c8df2bbd93fca49c26adf9',
'src/third_party/android_ndk': {
'url': Var('chromium_git') + '/android_ndk.git' + '@' + '4e2cea441bfd43f0863d14f57b1e1844260b9884',
'condition': 'checkout_android',
@@ -107,7 +107,7 @@
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/depot_tools':
- Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'edcefdcf7d5a3a6d44b21cdaf91d7b2fe8b97373',
+ Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '4d2d5b4bbe385b37659efcdd7e7641622c05bd2a',
'src/third_party/errorprone/lib': {
'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7',
'condition': 'checkout_android',
@@ -173,7 +173,7 @@
# Used by boringssl.
'src/third_party/nasm': {
'url': Var('chromium_git') + '/chromium/deps/nasm.git' + '@' +
- 'a0a6951e259bd347c133969740348bb5ebb468c4'
+ '20920a85609b0608d4c9c80b525196d07183b289'
},
'src/third_party/openh264/src':
@@ -225,7 +225,7 @@
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '720b70524a4424b15fc57e82263568c8ba0496ad',
'src/tools':
- Var('chromium_git') + '/chromium/src/tools' + '@' + 'f8ace9b670bce295b7692de682da14d914c3be41',
+ Var('chromium_git') + '/chromium/src/tools' + '@' + 'a8e76f0ca501f936df20c1fc191b931ce5e21e73',
'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
diff --git a/modules/audio_coding/acm2/audio_coding_module_unittest.cc b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
index 27a782e..b227cfb 100644
--- a/modules/audio_coding/acm2/audio_coding_module_unittest.cc
+++ b/modules/audio_coding/acm2/audio_coding_module_unittest.cc
@@ -1439,14 +1439,14 @@
TEST_F(AcmSenderBitExactnessOldApi, Opus_stereo_20ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 2, 120, 960, 960));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "fd5d57d6d766908e6a7211e2a5c7f78a",
- "fd5d57d6d766908e6a7211e2a5c7f78a",
+ "3e285b74510e62062fbd8142dacd16e9",
+ "3e285b74510e62062fbd8142dacd16e9",
"439e97ad1932c49923b5da029c17dd5e",
"038ec90f5f3fc2320f3090f8ecef6bb7",
"038ec90f5f3fc2320f3090f8ecef6bb7"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "b693bd95c2ee2354f92340dd09e9da68",
- "b693bd95c2ee2354f92340dd09e9da68",
+ "78cf8f03157358acdc69f6835caa0d9b",
+ "78cf8f03157358acdc69f6835caa0d9b",
"ab88b1a049c36bdfeb7e8b057ef6982a",
"27fef7b799393347ec3b5694369a1c36",
"27fef7b799393347ec3b5694369a1c36"),
@@ -1459,14 +1459,14 @@
ASSERT_NO_FATAL_FAILURE(SetUpTestExternalEncoder(
AudioEncoderOpus::MakeAudioEncoder(*config, 120), 120));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "fd5d57d6d766908e6a7211e2a5c7f78a",
- "fd5d57d6d766908e6a7211e2a5c7f78a",
+ "3e285b74510e62062fbd8142dacd16e9",
+ "3e285b74510e62062fbd8142dacd16e9",
"439e97ad1932c49923b5da029c17dd5e",
"038ec90f5f3fc2320f3090f8ecef6bb7",
"038ec90f5f3fc2320f3090f8ecef6bb7"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "b693bd95c2ee2354f92340dd09e9da68",
- "b693bd95c2ee2354f92340dd09e9da68",
+ "78cf8f03157358acdc69f6835caa0d9b",
+ "78cf8f03157358acdc69f6835caa0d9b",
"ab88b1a049c36bdfeb7e8b057ef6982a",
"27fef7b799393347ec3b5694369a1c36",
"27fef7b799393347ec3b5694369a1c36"),
@@ -1481,14 +1481,14 @@
ASSERT_NO_FATAL_FAILURE(SetUpTestExternalEncoder(
AudioEncoderOpus::MakeAudioEncoder(*config, 120), 120));
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "3cd4e1bc2acd9440bb9e97af34080ffc",
- "3cd4e1bc2acd9440bb9e97af34080ffc",
+ "b0325df4e8104f04e03af23c0b75800e",
+ "b0325df4e8104f04e03af23c0b75800e",
"1c81121f5d9286a5a865d01dbab22ce8",
"11d547f89142e9ef03f37d7ca7f32379",
"11d547f89142e9ef03f37d7ca7f32379"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
- "4fc0af0aa06c26454af09832d3ec1b4e",
- "4fc0af0aa06c26454af09832d3ec1b4e",
+ "4eab2259b6fe24c22dd242a113e0b3d9",
+ "4eab2259b6fe24c22dd242a113e0b3d9",
"839ea60399447268ee0f0262a50b75fd",
"1815fd5589cad0c6f6cf946c76b81aeb",
"1815fd5589cad0c6f6cf946c76b81aeb"),
diff --git a/modules/audio_coding/neteq/neteq_unittest.cc b/modules/audio_coding/neteq/neteq_unittest.cc
index aec29a4..1c9b9e7 100644
--- a/modules/audio_coding/neteq/neteq_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_unittest.cc
@@ -502,11 +502,11 @@
webrtc::test::ResourcePath("audio_coding/neteq_opus", "rtp");
const std::string output_checksum =
- PlatformChecksum("2c05677daa968d6c68b92adf4affb7cd9bb4d363",
+ PlatformChecksum("14a63b3c7b925c82296be4bafc71bec85f2915c2",
"b7b7ed802b0e18ee416973bf3b9ae98599b0181d",
"5876e52dda90d5ca433c3726555b907b97c86374",
- "2c05677daa968d6c68b92adf4affb7cd9bb4d363",
- "2c05677daa968d6c68b92adf4affb7cd9bb4d363");
+ "14a63b3c7b925c82296be4bafc71bec85f2915c2",
+ "14a63b3c7b925c82296be4bafc71bec85f2915c2");
const std::string network_stats_checksum =
PlatformChecksum("adb3272498e436d1c019cbfd71610e9510c54497",
@@ -537,11 +537,11 @@
webrtc::test::ResourcePath("audio_coding/neteq_opus_dtx", "rtp");
const std::string output_checksum =
- PlatformChecksum("2ac10c4e79aeedd0df2863b079da5848b40f00b5",
+ PlatformChecksum("713af6c92881f5aab1285765ee6680da9d1c06ce",
"3ec991b96872123f1554c03c543ca5d518431e46",
"da9f9a2d94e0c2d67342fad4965d7b91cda50b25",
- "2ac10c4e79aeedd0df2863b079da5848b40f00b5",
- "2ac10c4e79aeedd0df2863b079da5848b40f00b5");
+ "713af6c92881f5aab1285765ee6680da9d1c06ce",
+ "713af6c92881f5aab1285765ee6680da9d1c06ce");
const std::string network_stats_checksum =
"bab58dc587d956f326056d7340c96eb9d2d3cc21";
