ACM: Move NACK functionality inside NetEq

webrtc/modules/audio_coding/main/acm2/acm_receiver.h

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 17 matching lines @@
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 struct CodecInst;
 class CriticalSectionWrapper;
 class NetEq;
 
 namespace acm2 {
 
-class Nack;
-
 class AcmReceiver {
  public:
   struct Decoder {
     int acm_codec_id;
     uint8_t payload_type;
     // This field is meaningful for codecs where both mono and
     // stereo versions are registered under the same ID.
     int channels;
     int sample_rate_hz;
   };
@@ skipping 264 matching lines @@
   rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
   int id_;  // TODO(henrik.lundin) Make const.
   const Decoder* last_audio_decoder_ GUARDED_BY(crit_sect_);
   AudioFrame::VADActivity previous_audio_activity_ GUARDED_BY(crit_sect_);
   int current_sample_rate_hz_ GUARDED_BY(crit_sect_);
   ACMResampler resampler_ GUARDED_BY(crit_sect_);
   // Used in GetAudio, declared as member to avoid allocating every 10ms.
   // TODO(henrik.lundin) Stack-allocate in GetAudio instead?
   rtc::scoped_ptr<int16_t[]> audio_buffer_ GUARDED_BY(crit_sect_);
   rtc::scoped_ptr<int16_t[]> last_audio_buffer_ GUARDED_BY(crit_sect_);
-  rtc::scoped_ptr<Nack> nack_ GUARDED_BY(crit_sect_);
-  bool nack_enabled_ GUARDED_BY(crit_sect_);
   CallStatistics call_stats_ GUARDED_BY(crit_sect_);
   NetEq* neteq_;
   // Decoders map is keyed by payload type
   std::map<uint8_t, Decoder> decoders_ GUARDED_BY(crit_sect_);
   bool vad_enabled_;
   Clock* clock_;  // TODO(henrik.lundin) Make const if possible.
   bool resampled_last_output_frame_ GUARDED_BY(crit_sect_);
 
   // Indicates if a non-zero initial delay is set, and the receiver is in
   // AV-sync mode.
   bool av_sync_;
   rtc::scoped_ptr<InitialDelayManager> initial_delay_manager_;
 
   // The following are defined as members to avoid creating them in every
   // iteration. |missing_packets_sync_stream_| is *ONLY* used in InsertPacket().
   // |late_packets_sync_stream_| is only used in GetAudio(). Both of these
   // member variables are allocated only when we AV-sync is enabled, i.e.
   // initial delay is set.
   rtc::scoped_ptr<InitialDelayManager::SyncStream> missing_packets_sync_stream_;
   rtc::scoped_ptr<InitialDelayManager::SyncStream> late_packets_sync_stream_;
 };
 
 }  // namespace acm2
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_RECEIVER_H_