Moving/renaming webrtc/common.h.

webrtc/media/engine/fakewebrtcvoiceengine.h

 /*
  *  Copyright (c) 2010 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 136 matching lines @@
     }
     bool vad = false;
     bool codec_fec = false;
     int max_encoding_bandwidth = 0;
     bool opus_dtx = false;
     int cn8_type = 13;
     int cn16_type = 105;
     int associate_send_channel = -1;
     std::vector<webrtc::CodecInst> recv_codecs;
     webrtc::CodecInst send_codec;
-    int neteq_capacity = -1;
+    size_t neteq_capacity = -1;

[tommi, 2016/09/02 07:59:52]

assigning a negative value to an unsigned type doesn't feel right (or comparing
against one for that matter).  is ~0 more appropriate (e.g. define a constant
for that special value)?

[kwiberg-webrtc, 2016/09/02 08:05:51]

Now, sing with me:

 ♪ rtc::Optional, rtc::Optional, rtc::Optional, ... ♪♪

[the sun, 2016/09/02 08:54:40]

In this context, setting it to zero will work fine though.

     bool neteq_fast_accelerate = false;
   };
 
   FakeWebRtcVoiceEngine() {
     memset(&agc_config_, 0, sizeof(agc_config_));
   }
   ~FakeWebRtcVoiceEngine() override {
     RTC_CHECK(channels_.empty());
   }
 
@@ skipping 15 matching lines @@
     return channels_[channel]->max_encoding_bandwidth;
   }
   int GetSendCNPayloadType(int channel, bool wideband) {
     return (wideband) ?
         channels_[channel]->cn16_type :
         channels_[channel]->cn8_type;
   }
   void set_fail_create_channel(bool fail_create_channel) {
     fail_create_channel_ = fail_create_channel;
   }
-  int AddChannel(const webrtc::Config& config) {
+  int AddChannel(const webrtc::AudioCodingModule::Config& acm_config) {
     if (fail_create_channel_) {
       return -1;
     }
     Channel* ch = new Channel();
     auto db = webrtc::acm2::RentACodec::Database();
     ch->recv_codecs.assign(db.begin(), db.end());
-    if (config.Get<webrtc::NetEqCapacityConfig>().enabled) {
-      ch->neteq_capacity = config.Get<webrtc::NetEqCapacityConfig>().capacity;
-    }
-    ch->neteq_fast_accelerate =
-        config.Get<webrtc::NetEqFastAccelerate>().enabled;
+    ch->neteq_capacity = acm_config.neteq_config.max_packets_in_buffer;
+    ch->neteq_fast_accelerate = acm_config.neteq_config.enable_fast_accelerate;
     channels_[++last_channel_] = ch;
     return last_channel_;
   }
 
   int GetNumSetSendCodecs() const { return num_set_send_codecs_; }
 
   int GetAssociateSendChannel(int channel) {
     return channels_[channel]->associate_send_channel;
   }
 
@@ skipping 15 matching lines @@
     inited_ = false;
     return 0;
   }
   webrtc::AudioProcessing* audio_processing() override {
     return &audio_processing_;
   }
   webrtc::AudioDeviceModule* audio_device_module() override {
     return nullptr;
   }
   WEBRTC_FUNC(CreateChannel, ()) {
-    webrtc::Config empty_config;
-    return AddChannel(empty_config);
+    return AddChannel(webrtc::AudioCodingModule::Config());
   }
-  WEBRTC_FUNC(CreateChannel, (const webrtc::Config& config)) {
-    return AddChannel(config);
+  WEBRTC_FUNC(CreateChannel,
+              (const webrtc::AudioCodingModule::Config& acm_config)) {
+    return AddChannel(acm_config);
   }
   WEBRTC_FUNC(DeleteChannel, (int channel)) {
     WEBRTC_CHECK_CHANNEL(channel);
     for (const auto& ch : channels_) {
       if (ch.second->associate_send_channel == channel) {
         ch.second->associate_send_channel = -1;
       }
     }
     delete channels_[channel];
     channels_.erase(channel);
@@ skipping 285 matching lines @@
   }
   bool IsHighPassFilterEnabled() override {
     return highpass_filter_enabled_;
   }
   bool IsStereoChannelSwappingEnabled() override {
     return stereo_swapping_enabled_;
   }
   void EnableStereoChannelSwapping(bool enable) override {
     stereo_swapping_enabled_ = enable;
   }
-  int GetNetEqCapacity() const {
+  size_t GetNetEqCapacity() const {
     auto ch = channels_.find(last_channel_);
     ASSERT(ch != channels_.end());
     return ch->second->neteq_capacity;
   }
   bool GetNetEqFastAccelerate() const {
     auto ch = channels_.find(last_channel_);
     ASSERT(ch != channels_.end());
     return ch->second->neteq_fast_accelerate;
   }
 
@@ skipping 15 matching lines @@
   webrtc::AecmModes aecm_mode_ = webrtc::kAecmSpeakerphone;
   webrtc::NsModes ns_mode_ = webrtc::kNsDefault;
   webrtc::AgcModes agc_mode_ = webrtc::kAgcDefault;
   webrtc::AgcConfig agc_config_;
   FakeAudioProcessing audio_processing_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_