Enabling NetEq bit-exactness test for Win x64
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/webrtc@6204 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/audio_coding/neteq4/neteq_unittest.cc b/modules/audio_coding/neteq4/neteq_unittest.cc
index 9103436..f66a3cf 100644
--- a/modules/audio_coding/neteq4/neteq_unittest.cc
+++ b/modules/audio_coding/neteq4/neteq_unittest.cc
@@ -524,25 +524,14 @@
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, "");
diff --git a/modules/modules_unittests.isolate b/modules/modules_unittests.isolate
index 054d430..57d1307 100644
--- a/modules/modules_unittests.isolate
+++ b/modules/modules_unittests.isolate
@@ -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',
