From 49c454e748ce89c195b2440b5f194ddb706d949b Mon Sep 17 00:00:00 2001 From: minyue Date: Fri, 8 Jan 2016 11:30:14 -0800 Subject: [PATCH] Cleaning neteq_unittest resource files. BUG=webrtc:2692 Review URL: https://codereview.webrtc.org/1563983003 Cr-Commit-Position: refs/heads/master@{#11189} --- resources/audio_coding/neteq_network_stats.dat.sha1 | 1 - resources/audio_coding/neteq_network_stats_win_32.dat.sha1 | 1 - resources/audio_coding/neteq_rtcp_stats.dat.sha1 | 1 - resources/audio_coding/neteq_universal_ref.pcm.sha1 | 1 - resources/audio_coding/neteq_universal_ref_win_32.pcm.sha1 | 1 - webrtc/modules/audio_coding/neteq/neteq_unittest.cc | 4 ++-- webrtc/modules/modules_unittests.isolate | 3 --- 7 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 resources/audio_coding/neteq_network_stats.dat.sha1 delete mode 100644 resources/audio_coding/neteq_network_stats_win_32.dat.sha1 delete mode 100644 resources/audio_coding/neteq_rtcp_stats.dat.sha1 delete mode 100644 resources/audio_coding/neteq_universal_ref.pcm.sha1 delete mode 100644 resources/audio_coding/neteq_universal_ref_win_32.pcm.sha1 diff --git a/resources/audio_coding/neteq_network_stats.dat.sha1 b/resources/audio_coding/neteq_network_stats.dat.sha1 deleted file mode 100644 index e02ad84b92..0000000000 --- a/resources/audio_coding/neteq_network_stats.dat.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3c189b500d92fd0f10cb4c770c298cee7008749 \ No newline at end of file diff --git a/resources/audio_coding/neteq_network_stats_win_32.dat.sha1 b/resources/audio_coding/neteq_network_stats_win_32.dat.sha1 deleted file mode 100644 index a197fc18b5..0000000000 --- a/resources/audio_coding/neteq_network_stats_win_32.dat.sha1 +++ /dev/null @@ -1 +0,0 @@ -343061419a64ca99323fc0d25a43149a5d40cf07 \ No newline at end of file diff --git a/resources/audio_coding/neteq_rtcp_stats.dat.sha1 b/resources/audio_coding/neteq_rtcp_stats.dat.sha1 deleted file mode 100644 index 42d37ac748..0000000000 --- a/resources/audio_coding/neteq_rtcp_stats.dat.sha1 +++ /dev/null @@ -1 +0,0 @@ -759d57e87517e0290144add9ba53d5c6dec1c27e \ No newline at end of file diff --git a/resources/audio_coding/neteq_universal_ref.pcm.sha1 b/resources/audio_coding/neteq_universal_ref.pcm.sha1 deleted file mode 100644 index 95e9de7d12..0000000000 --- a/resources/audio_coding/neteq_universal_ref.pcm.sha1 +++ /dev/null @@ -1 +0,0 @@ -236da353f05d329f6c83e441b80dbfcc18706cfb \ No newline at end of file diff --git a/resources/audio_coding/neteq_universal_ref_win_32.pcm.sha1 b/resources/audio_coding/neteq_universal_ref_win_32.pcm.sha1 deleted file mode 100644 index 47c90cfd4d..0000000000 --- a/resources/audio_coding/neteq_universal_ref_win_32.pcm.sha1 +++ /dev/null @@ -1 +0,0 @@ -1d2d353be4345d30506866ca32fa72825c6d65b8 \ No newline at end of file diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc index a6b9388f6c..a20d712c45 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_unittest.cc @@ -524,8 +524,8 @@ void NetEqDecodingTest::PopulateCng(int frame_index, #define MAYBE_TestBitExactness DISABLED_TestBitExactness #endif TEST_F(NetEqDecodingTest, MAYBE_TestBitExactness) { - const std::string input_rtp_file = webrtc::test::ProjectRootPath() + - "resources/audio_coding/neteq_universal_new.rtp"; + const std::string input_rtp_file = + webrtc::test::ResourcePath("audio_coding/neteq_universal_new", "rtp"); // 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. diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate index ba444df8c1..d988821af0 100644 --- a/webrtc/modules/modules_unittests.isolate +++ b/webrtc/modules/modules_unittests.isolate @@ -27,10 +27,7 @@ '<(DEPTH)/resources/audio_coding/neteq4_universal_ref.pcm', '<(DEPTH)/resources/audio_coding/neteq4_universal_ref_win_32.pcm', '<(DEPTH)/resources/audio_coding/neteq4_universal_ref_win_64.pcm', - '<(DEPTH)/resources/audio_coding/neteq_network_stats.dat', - '<(DEPTH)/resources/audio_coding/neteq_rtcp_stats.dat', '<(DEPTH)/resources/audio_coding/neteq_universal_new.rtp', - '<(DEPTH)/resources/audio_coding/neteq_universal_ref.pcm', '<(DEPTH)/resources/audio_coding/speech_mono_16kHz.pcm', '<(DEPTH)/resources/audio_coding/speech_mono_32_48kHz.pcm', '<(DEPTH)/resources/audio_coding/testfile32kHz.pcm',