generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enabling NetEq bit-exactness test for Win x64

Browse Source 
A new reference file (neteq4_universal_ref_win_64.pcm) was generated and
uploaded.

Also removing the old hack to have different reference files
for different version of Visual Studio. The test is now only supporting
VS 2012 and later (_MSC_VER >= 1700). This makes the windows 32-bit
output identical to the generic reference file
(neteq4_universal_ref.pcm), so the specialized one
(neteq4_universal_ref_win_32.pcm) could have been removed. However,
since the resources sync mechanism does not include removing of old
files, a client could pick up the old reference and fail. Therefore,
this cl also updates neteq4_universal_ref_win_32.pcm to be identical to
neteq4_universal_ref.pcm.

BUG=1458
R=kjellander@webrtc.org, tina.legrand@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14569005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6204 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org 2014-05-20 16:07:43 +00:00
parent aed31fe8ab
commit 48438c2c90
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/audio_coding/neteq4_universal_ref_win_32.pcm.sha1
View File

@ -1 +1 @@
eb60f83b0db65826622c390e8d2e688345aff1dd
49d12cf21b37f2da3f52cf2ab76ecb08adbb2a69

1
resources/audio_coding/neteq4_universal_ref_win_64.pcm.sha1 Normal file
View File

@ -0,0 +1 @@
84972ecea6a0bf85b873f109c88697eab44cedd3

19
webrtc/modules/audio_coding/neteq4/neteq_unittest.cc
View File

@ -524,25 +524,14 @@ void NetEqDecodingTest::CheckBgnOff(int sampling_rate_hz,
EXPECT_TRUE(plc_to_cng); // Just to be sure that PLC-to-CNG has occurred.
}
#if defined(_WIN32) && defined(WEBRTC_ARCH_64_BITS)
// Disabled for Windows 64-bit until webrtc:1458 is fixed.
#define MAYBE_TestBitExactness DISABLED_TestBitExactness
#else
#define MAYBE_TestBitExactness TestBitExactness
#endif
TEST_F(NetEqDecodingTest, DISABLED_ON_ANDROID(MAYBE_TestBitExactness)) {
TEST_F(NetEqDecodingTest, DISABLED_ON_ANDROID(TestBitExactness)) {
const std::string input_rtp_file = webrtc::test::ProjectRootPath() +
"resources/audio_coding/neteq_universal_new.rtp";
#if defined(_MSC_VER) && (_MSC_VER >= 1700)
// For Visual Studio 2012 and later, we will have to use the generic reference
// file, rather than the windows-specific one.
const std::string input_ref_file = webrtc::test::ProjectRootPath() +
"resources/audio_coding/neteq4_universal_ref.pcm";
#else
// Note that neteq4_universal_ref.pcm and neteq4_universal_ref_win_32.pcm
// are identical. The latter could have been removed, but if clients still
// have a copy of the file, the test will fail.
const std::string input_ref_file =
webrtc::test::ResourcePath("audio_coding/neteq4_universal_ref", "pcm");
#endif
if (FLAGS_gen_ref) {
DecodeAndCompare(input_rtp_file, "");

2
webrtc/modules/modules_unittests.isolate
View File

@ -38,6 +38,8 @@
'../../resources/audio_coding/neteq4_network_stats.dat',
'../../resources/audio_coding/neteq4_rtcp_stats.dat',
'../../resources/audio_coding/neteq4_universal_ref.pcm',
'../../resources/audio_coding/neteq4_universal_ref_win_32.pcm',
'../../resources/audio_coding/neteq4_universal_ref_win_64.pcm',
'../../resources/audio_coding/neteq_network_stats.dat',
'../../resources/audio_coding/neteq_rtcp_stats.dat',
'../../resources/audio_coding/neteq_universal_new.rtp',