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

Roll chromium_revision a8e5140..c6076f2 (372922:372974) incl. update to Opus v.1.1.2

Browse Source 
Includes updates to tests for Opus v.1.1.2, reveiwed in
https://codereview.webrtc.org/1629413002/

Change log: a8e5140..c6076f2
Full diff: a8e5140..c6076f2

Changed dependencies:
* src/third_party/catapult: 471db30..d4d48e6
* src/third_party/opus/src: cae6961..655cc54
DEPS diff: a8e5140..c6076f2/DEPS

No update to Clang.

BUG=chromium:580524
TBR=

Review URL: https://codereview.webrtc.org/1657343002

Cr-Commit-Position: refs/heads/master@{#11464}
This commit is contained in:
kjellander
2016-02-02 13:18:33 -08:00
committed by Commit bot
parent a7ad7c3ca0
commit c3a0983d4b
12 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
View File

@ -1406,13 +1406,13 @@ TEST_F(AcmSenderBitExactnessOldApi, Opus_stereo_20ms) {
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
"855041f2490b887302bce9d544731849",
"855041f2490b887302bce9d544731849",
"1e1a0fce893fef2d66886a7f09e2ebce",
"7417a66c28be42d5d9b2d64e0c191585"),
"9692eede45638eb425e0daf9c75b5c7a",
"c4faa472fbb0730370aaf34920381a09"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
"d781cce1ab986b618d0da87226cdde30",
"d781cce1ab986b618d0da87226cdde30",
"1a1fe04dd12e755949987c8d729fb3e0",
"47b0b04f1d03076b857c86c72c2c298b"),
"8d6782b905c3230d4b0e3e83e1fc3439",
"8b0126eab82d9e4e367ab33ded2f1a8e"),
50, test::AcmReceiveTestOldApi::kStereoOutput);
}
@ -1423,13 +1423,13 @@ TEST_F(AcmSenderBitExactnessOldApi, Opus_stereo_20ms_voip) {
Run(AcmReceiverBitExactnessOldApi::PlatformChecksum(
"9b9e12bc3cc793740966e11cbfa8b35b",
"9b9e12bc3cc793740966e11cbfa8b35b",
"57412a4b5771d19ff03ec35deffe7067",
"7ad0bbefcaa87e23187bf4a56d2f3513"),
"0de6249018fdd316c21086db84e10610",
"fd21a19b6b1e891f5daea6c4a299c254"),
AcmReceiverBitExactnessOldApi::PlatformChecksum(
"c7340b1189652ab6b5e80dade7390cb4",
"c7340b1189652ab6b5e80dade7390cb4",
"cdfe85939c411d12b61701c566e22d26",
"7a678fbe46df5bf0c67e88264a2d9275"),
"95612864c954ee63e28cc6eebad56626",
"49954b0d5a5f705a8798e7071b0c6f36"),
50, test::AcmReceiveTestOldApi::kStereoOutput);
}
@ -1497,9 +1497,9 @@ class AcmSetBitRateOldApi : public ::testing::Test {
TEST_F(AcmSetBitRateOldApi, Opus_48khz_20ms_10kbps) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 1, 107, 960, 960));
#if defined(WEBRTC_ANDROID)
Run(10000, 9328);
Run(10000, 9288);
#else
Run(10000, 9072);
Run(10000, 9024);
#endif // WEBRTC_ANDROID
}
@ -1507,9 +1507,9 @@ TEST_F(AcmSetBitRateOldApi, Opus_48khz_20ms_10kbps) {
TEST_F(AcmSetBitRateOldApi, Opus_48khz_20ms_50kbps) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 1, 107, 960, 960));
#if defined(WEBRTC_ANDROID)
Run(50000, 47952);
Run(50000, 47960);
#else
Run(50000, 49600);
Run(50000, 49544);
#endif // WEBRTC_ANDROID
}
@ -1589,18 +1589,18 @@ class AcmChangeBitRateOldApi : public AcmSetBitRateOldApi {
TEST_F(AcmChangeBitRateOldApi, Opus_48khz_20ms_10kbps) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 1, 107, 960, 960));
#if defined(WEBRTC_ANDROID)
Run(10000, 32200, 5496);
Run(10000, 32200, 5176);
#else
Run(10000, 32200, 5432);
Run(10000, 32200, 5456);
#endif // WEBRTC_ANDROID
}
TEST_F(AcmChangeBitRateOldApi, Opus_48khz_20ms_50kbps) {
ASSERT_NO_FATAL_FAILURE(SetUpTest("opus", 48000, 1, 107, 960, 960));
#if defined(WEBRTC_ANDROID)
Run(50000, 32200, 24912);
Run(50000, 32200, 24768);
#else
Run(50000, 32200, 24792);
Run(50000, 32200, 24848);
#endif // WEBRTC_ANDROID
}

4
webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc
View File

@ -206,9 +206,9 @@ void OpusTest::TestDtxEffect(bool dtx, int block_length_ms) {
const int kCheckTimeMs = 1500;
#if defined(OPUS_FIXED_POINT)
const uint16_t kOutputValueBound = 20;
const uint16_t kOutputValueBound = 30;
#else
const uint16_t kOutputValueBound = 2;
const uint16_t kOutputValueBound = 8;
#endif
int time = 0;

6
webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc
View File

@ -61,9 +61,15 @@ void RunAnalysisTest(const std::string& audio_filename,
}
TEST(AudioClassifierTest, DoAnalysisMono) {
#if defined(WEBRTC_ARCH_ARM) || defined(WEBRTC_ARCH_ARM64)
RunAnalysisTest(test::ResourcePath("short_mixed_mono_48", "pcm"),
test::ResourcePath("short_mixed_mono_48_arm", "dat"),
1);
#else
RunAnalysisTest(test::ResourcePath("short_mixed_mono_48", "pcm"),
test::ResourcePath("short_mixed_mono_48", "dat"),
1);
#endif // WEBRTC_ARCH_ARM
}
TEST(AudioClassifierTest, DoAnalysisStereo) {

4
webrtc/modules/audio_coding/neteq/neteq_unittest.cc
View File

@ -568,8 +568,12 @@ TEST_F(NetEqDecodingTest, MAYBE_TestOpusBitExactness) {
const std::string input_rtp_file =
webrtc::test::ResourcePath("audio_coding/neteq_opus", "rtp");
const std::string input_ref_file =
// The pcm files were generated by using Opus v1.1.2 to decode the RTC
// file generated by Opus v1.1
webrtc::test::ResourcePath("audio_coding/neteq4_opus_ref", "pcm");
const std::string network_stat_ref_file =
// The network stats file was generated when using Opus v1.1.2 to decode
// the RTC file generated by Opus v1.1
webrtc::test::ResourcePath("audio_coding/neteq4_opus_network_stats",
"dat");
const std::string rtcp_stat_ref_file =