diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc index dddeafdc9b..a6b3091751 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc @@ -196,7 +196,7 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = { #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX)) {2, {kIsacPacSize480, kIsacPacSize960}, 0, 1, true}, # if (defined(WEBRTC_CODEC_ISAC)) - {1, {kIsacPacSize960}, 0, 1, false}, + {1, {kIsacPacSize960}, 0, 1, true}, {1, {kIsacPacSize1440}, 0, 1, true}, # endif #endif diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc index b9fc6f32bd..4ee53391e7 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc @@ -568,9 +568,9 @@ class AcmReceiverBitExactness : public ::testing::Test { #endif TEST_F(AcmReceiverBitExactness, MAYBE_8kHzOutput) { Run(8000, - PlatformChecksum("bd6f8d9602cd82444ea2539e674df747", + PlatformChecksum("dcee98c623b147ebe1b40dd30efa896e", "6ac89c7145072c26bfeba602cd661afb", - "8a8440f5511eb729221b9aac25cda3a0")); + "908002dc01fc4eb1d2be24eb1d3f354b")); } // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 @@ -581,9 +581,9 @@ TEST_F(AcmReceiverBitExactness, MAYBE_8kHzOutput) { #endif TEST_F(AcmReceiverBitExactness, MAYBE_16kHzOutput) { Run(16000, - PlatformChecksum("a39bc6ee0c4eb15f3ad2f43cebcc571d", + PlatformChecksum("f790e7a8cce4e2c8b7bb5e0e4c5dac0d", "3e888eb04f57db2c6ef952fe64f17fe6", - "7be583092c5adbcb0f6cd66eca20ea63")); + "a909560b5ca49fa472b17b7b277195e9")); } // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 @@ -594,9 +594,9 @@ TEST_F(AcmReceiverBitExactness, MAYBE_16kHzOutput) { #endif TEST_F(AcmReceiverBitExactness, MAYBE_32kHzOutput) { Run(32000, - PlatformChecksum("80964572aaa2dc92f9e34896dd3802b3", + PlatformChecksum("306e0d990ee6e92de3fbecc0123ece37", "aeca37e963310f5b6552b7edea23c2f1", - "3a84188abe9fca25fedd6034760f3e22")); + "441aab4b347fb3db4e9244337aca8d8e")); } // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 @@ -607,9 +607,9 @@ TEST_F(AcmReceiverBitExactness, MAYBE_32kHzOutput) { #endif TEST_F(AcmReceiverBitExactness, MAYBE_48kHzOutput) { Run(48000, - PlatformChecksum("8aacde91f390e0d5a9c2ed571a25fd37", + PlatformChecksum("aa7c232f63a67b2a72703593bdd172e0", "76b9e99e0a3998aa28355e7a2bd836f7", - "89b4b19bdb4de40f1d88302ef8cb9f9b")); + "4ee2730fa1daae755e8a8fd3abd779ec")); } // This test verifies bit exactness for the send-side of ACM. The test setup is diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc index 2bcefacc73..8cff055da1 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc @@ -579,9 +579,9 @@ class AcmReceiverBitExactnessOldApi : public ::testing::Test { #endif TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_8kHzOutput) { Run(8000, - PlatformChecksum("bd6f8d9602cd82444ea2539e674df747", + PlatformChecksum("dcee98c623b147ebe1b40dd30efa896e", "6ac89c7145072c26bfeba602cd661afb", - "8a8440f5511eb729221b9aac25cda3a0")); + "908002dc01fc4eb1d2be24eb1d3f354b")); } // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 @@ -592,9 +592,9 @@ TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_8kHzOutput) { #endif TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_16kHzOutput) { Run(16000, - PlatformChecksum("a39bc6ee0c4eb15f3ad2f43cebcc571d", + PlatformChecksum("f790e7a8cce4e2c8b7bb5e0e4c5dac0d", "3e888eb04f57db2c6ef952fe64f17fe6", - "7be583092c5adbcb0f6cd66eca20ea63")); + "a909560b5ca49fa472b17b7b277195e9")); } // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 @@ -605,9 +605,9 @@ TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_16kHzOutput) { #endif TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_32kHzOutput) { Run(32000, - PlatformChecksum("80964572aaa2dc92f9e34896dd3802b3", + PlatformChecksum("306e0d990ee6e92de3fbecc0123ece37", "aeca37e963310f5b6552b7edea23c2f1", - "3a84188abe9fca25fedd6034760f3e22")); + "441aab4b347fb3db4e9244337aca8d8e")); } // Fails Android ARM64. https://code.google.com/p/webrtc/issues/detail?id=4199 @@ -618,9 +618,9 @@ TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_32kHzOutput) { #endif TEST_F(AcmReceiverBitExactnessOldApi, MAYBE_48kHzOutput) { Run(48000, - PlatformChecksum("8aacde91f390e0d5a9c2ed571a25fd37", + PlatformChecksum("aa7c232f63a67b2a72703593bdd172e0", "76b9e99e0a3998aa28355e7a2bd836f7", - "89b4b19bdb4de40f1d88302ef8cb9f9b")); + "4ee2730fa1daae755e8a8fd3abd779ec")); } // This test verifies bit exactness for the send-side of ACM. The test setup is