aboutsummaryrefslogtreecommitdiff
path: root/webrtc/modules/modules.gyp
diff options
context:
space:
mode:
authorhenrik.lundin <henrik.lundin@webrtc.org>2015-10-29 05:36:24 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-29 12:36:32 +0000
commit48ed930975ef7e84023044ed584c4eff914e6c9a (patch)
treecbfa42150bcff2f4b47b10aa06b3fcefd4d0f62f /webrtc/modules/modules.gyp
parenta35ae7f507cc4e909dd4253106c97528db315adb (diff)
downloadwebrtc-48ed930975ef7e84023044ed584c4eff914e6c9a.tar.gz
ACM: Move NACK functionality inside NetEq
Negative acknowledgement (NACK) has up to now been implemented in ACM. But, since NetEq is in charge of the actual packet buffer, it makes more sense to have the NACK functionlaity in there. This CL does the following: - Move nack.{h,cc} and the unit tests from main/acm2 to neteq. - Move the NACK related code in ACM into NetEq. - NACK related functions in AcmReceiver are changed to simple forwarding APIs. - Remove unused members in AcmReceiver. - Remove unused API functions in NetEq. BUG=webrtc:3520 Review URL: https://codereview.webrtc.org/1410073006 Cr-Commit-Position: refs/heads/master@{#10448}
Diffstat (limited to 'webrtc/modules/modules.gyp')
-rw-r--r--webrtc/modules/modules.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 68cf53ea24..2bf0ac8079 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -103,7 +103,6 @@
'audio_coding/main/acm2/call_statistics_unittest.cc',
'audio_coding/main/acm2/codec_owner_unittest.cc',
'audio_coding/main/acm2/initial_delay_manager_unittest.cc',
- 'audio_coding/main/acm2/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',
@@ -130,6 +129,7 @@
'audio_coding/neteq/dtmf_tone_generator_unittest.cc',
'audio_coding/neteq/expand_unittest.cc',
'audio_coding/neteq/merge_unittest.cc',
+ 'audio_coding/neteq/nack_unittest.cc',
'audio_coding/neteq/neteq_external_decoder_unittest.cc',
'audio_coding/neteq/neteq_impl_unittest.cc',
'audio_coding/neteq/neteq_network_stats_unittest.cc',