commit 6ea3d1cc9e45ca5661b06ec3390282fa50ded349
author turaj@webrtc.org <turaj@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Oct 02 21:44:33 2013 +0000
committer turaj@webrtc.org <turaj@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Oct 02 21:44:33 2013 +0000
tree 0dc5d400d21836e01f53a9ba852a0ef74d49bb83
parent 2a9731795346e7b4658722cc39e900674435cfcd

ACM test are modified to run with both ACM1 and ACM2.

Beside the changes in test files. acm2/acm_generic_codec.cc and acm2/audio_coding_module_impl.cc are modified to fix a bug.

Also, nack{.cc, .h, _unittest.cc} are removed form main/sourc as nack files in both ACM1 and ACM2 are essentially identical.

R=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4908 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/modules.gyp

diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 3a93624..e32eee6 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -64,6 +64,9 @@
         {
           'target_name': 'modules_unittests',
           'type': '<(gtest_target_type)',
+          'defines': [
+            '<@(audio_coding_defines)',
+          ],
           'dependencies': [
             'audio_coding_module',
             'audio_processing',
@@ -98,8 +101,10 @@
             '<(webrtc_root)/common_video/common_video.gyp:frame_generator',
           ],
           'sources': [
+            'audio_coding/main/acm2/acm_receiver_unittest.cc',
+            'audio_coding/main/acm2/initial_delay_manager_unittest.cc',
+            'audio_coding/main/acm2/nack_unittest.cc',
             'audio_coding/main/source/acm_neteq_unittest.cc',
-            'audio_coding/main/source/nack_unittest.cc',
             'audio_coding/codecs/cng/cng_unittest.cc',
             'audio_coding/codecs/isac/fix/source/filters_unittest.cc',
             'audio_coding/codecs/isac/fix/source/filterbanks_unittest.cc',