zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Opus tests for Opus 1.3

Browse Source 
This updates various bitexactness tests and other tests that no longer
pass.

Bug: webrtc:11325
Change-Id: Ifa3e4b42e303f5573e028dfdf8a108a76f6318ae
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168952
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30688}
This commit is contained in:
Ivo Creusen
2020-03-04 17:16:59 +01:00
committed by Commit Bot
parent 99eb20b513
commit 16ddae924e
5 changed files with 49 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
modules/audio_coding/acm2/audio_coding_module_unittest.cc
View File

@ -1433,37 +1433,35 @@ TEST_F(AcmSenderBitExactnessOldApi, MAYBE_G722_stereo_20ms) {
namespace {
// Checksum depends on libopus being compiled with or without SSE.
const std::string audio_maybe_sse =
"3e285b74510e62062fbd8142dacd16e9|"
"fd5d57d6d766908e6a7211e2a5c7f78a";
"e0ddf36854059151cdb7a0c4af3d282a"
"|32574e78db4eab0c467d3c0785e3b484";
const std::string payload_maybe_sse =
"78cf8f03157358acdc69f6835caa0d9b|"
"b693bd95c2ee2354f92340dd09e9da68";
"b43bdf7638b2bc2a5a6f30bdc640b9ed"
"|c30d463e7ed10bdd1da9045f80561f27";
// Common checksums.
const std::string audio_checksum =
AcmReceiverBitExactnessOldApi::PlatformChecksum(
audio_maybe_sse,
audio_maybe_sse,
"439e97ad1932c49923b5da029c17dd5e",
"038ec90f5f3fc2320f3090f8ecef6bb7",
"038ec90f5f3fc2320f3090f8ecef6bb7");
"6fcceb83acf427730570bc13eeac920c",
"fd96f15d547c4e155daeeef4253b174e",
"fd96f15d547c4e155daeeef4253b174e");
const std::string payload_checksum =
AcmReceiverBitExactnessOldApi::PlatformChecksum(
payload_maybe_sse,
payload_maybe_sse,
"ab88b1a049c36bdfeb7e8b057ef6982a",
"27fef7b799393347ec3b5694369a1c36",
"27fef7b799393347ec3b5694369a1c36");
"4bd846d0aa5656ecd5dfd85701a1b78c",
"7efbfc9f8e3b4b2933ae2d01ab919028",
"7efbfc9f8e3b4b2933ae2d01ab919028");
} // namespace
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
TEST_F(AcmSenderBitExactnessOldApi, DISABLED_Opus_stereo_20ms) {
TEST_F(AcmSenderBitExactnessOldApi, Opus_stereo_20ms) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 2, 120, 960, 960));
Run(audio_checksum, payload_checksum, 50,
test::AcmReceiveTestOldApi::kStereoOutput);
}
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
TEST_F(AcmSenderBitExactnessNewApi, DISABLED_OpusFromFormat_stereo_20ms) {
TEST_F(AcmSenderBitExactnessNewApi, MAYBE_OpusFromFormat_stereo_20ms) {
const auto config = AudioEncoderOpus::SdpToConfig(
SdpAudioFormat("opus", 48000, 2, {{"stereo", "1"}}));
ASSERT_TRUE(SetUpSender(kTestFileFakeStereo32kHz, 32000));
@ -1520,8 +1518,7 @@ TEST_F(AcmSenderBitExactnessNewApi, DISABLED_OpusManyChannels) {
50, test::AcmReceiveTestOldApi::kQuadOutput, decoder_factory);
}
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
TEST_F(AcmSenderBitExactnessNewApi, DISABLED_OpusFromFormat_stereo_20ms_voip) {
TEST_F(AcmSenderBitExactnessNewApi, OpusFromFormat_stereo_20ms_voip) {
auto config = AudioEncoderOpus::SdpToConfig(
SdpAudioFormat("opus", 48000, 2, {{"stereo", "1"}}));
// If not set, default will be kAudio in case of stereo.
@ -1529,22 +1526,21 @@ TEST_F(AcmSenderBitExactnessNewApi, DISABLED_OpusFromFormat_stereo_20ms_voip) {
ASSERT_TRUE(SetUpSender(kTestFileFakeStereo32kHz, 32000));
ASSERT_NO_FATAL_FAILURE(SetUpTestExternalEncoder(
AudioEncoderOpus::MakeAudioEncoder(*config, 120), 120));
// Checksum depends on libopus being compiled with or without SSE.
const std::string audio_maybe_sse =
"b0325df4e8104f04e03af23c0b75800e|"
"3cd4e1bc2acd9440bb9e97af34080ffc";
"2d7e5797444f75e5bfeaffbd8c25176b"
"|408d4bdc05a8c23e46c6ac06c5b917ee";
const std::string payload_maybe_sse =
"4eab2259b6fe24c22dd242a113e0b3d9|"
"4fc0af0aa06c26454af09832d3ec1b4e";
"b38b5584cfa7b6999b2e8e996c950c88"
"|eb0752ce1b6f2436fefc2e19bd084fb5";
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
audio_maybe_sse, audio_maybe_sse, "1c81121f5d9286a5a865d01dbab22ce8",
"11d547f89142e9ef03f37d7ca7f32379",
"11d547f89142e9ef03f37d7ca7f32379"),
audio_maybe_sse, audio_maybe_sse, "f1cefe107ffdced7694d7f735342adf3",
"3b1bfe5dd8ed16ee5b04b93a5b5e7e48",
"3b1bfe5dd8ed16ee5b04b93a5b5e7e48"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
payload_maybe_sse, payload_maybe_sse,
"839ea60399447268ee0f0262a50b75fd",
"1815fd5589cad0c6f6cf946c76b81aeb",
"1815fd5589cad0c6f6cf946c76b81aeb"),
"5e79a2f51c633fe145b6c10ae198d1aa",
"e730050cb304d54d853fd285ab0424fa",
"e730050cb304d54d853fd285ab0424fa"),
50, test::AcmReceiveTestOldApi::kStereoOutput);
}
@ -1621,18 +1617,16 @@ class AcmSetBitRateNewApi : public AcmSetBitRateTest {
}
};
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
TEST_F(AcmSetBitRateNewApi, DISABLED_OpusFromFormat_48khz_20ms_10kbps) {
TEST_F(AcmSetBitRateNewApi, OpusFromFormat_48khz_20ms_10kbps) {
const auto config = AudioEncoderOpus::SdpToConfig(
SdpAudioFormat("opus", 48000, 2, {{"maxaveragebitrate", "10000"}}));
ASSERT_TRUE(SetUpSender());
RegisterExternalSendCodec(AudioEncoderOpus::MakeAudioEncoder(*config, 107),
107);
RunInner(8000, 12000);
RunInner(7000, 12000);
}
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
TEST_F(AcmSetBitRateNewApi, DISABLED_OpusFromFormat_48khz_20ms_50kbps) {
TEST_F(AcmSetBitRateNewApi, OpusFromFormat_48khz_20ms_50kbps) {
const auto config = AudioEncoderOpus::SdpToConfig(
SdpAudioFormat("opus", 48000, 2, {{"maxaveragebitrate", "50000"}}));
ASSERT_TRUE(SetUpSender());
@ -1740,8 +1734,7 @@ TEST_F(AudioCodingModuleTestOldApi, SendingMonoForStereoInput) {
#define MAYBE_OpusFromFormat_48khz_20ms_100kbps \
OpusFromFormat_48khz_20ms_100kbps
#endif
// TODO(webrtc:11325) Reenable after Opus has been upgraded to 1.3.
TEST_F(AcmSetBitRateNewApi, DISABLED_OpusFromFormat_48khz_20ms_100kbps) {
TEST_F(AcmSetBitRateNewApi, MAYBE_OpusFromFormat_48khz_20ms_100kbps) {
const auto config = AudioEncoderOpus::SdpToConfig(
SdpAudioFormat("opus", 48000, 2, {{"maxaveragebitrate", "100000"}}));
ASSERT_TRUE(SetUpSender());