Moving/renaming webrtc/common.h.

webrtc/config.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.
  */
 
 // TODO(pbos): Move Config from common.h to here.
 
 #ifndef WEBRTC_CONFIG_H_
 #define WEBRTC_CONFIG_H_
 
 #include <string>
 #include <vector>
 
 #include "webrtc/base/optional.h"
-#include "webrtc/common.h"
 #include "webrtc/common_types.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 // Settings for NACK, see RFC 4585 for details.
 struct NackConfig {
   NackConfig() : rtp_history_ms(0) {}
   std::string ToString() const;
   // Send side: the time RTP packets are stored for retransmissions.
@@ skipping 132 matching lines @@
 struct VideoDecoderH264Settings {
   std::string sprop_parameter_sets;
 };
 
 class DecoderSpecificSettings {
  public:
   virtual ~DecoderSpecificSettings() {}
   rtc::Optional<VideoDecoderH264Settings> h264_extra_settings;
 };
 
-// Controls the capacity of the packet buffer in NetEq. The capacity is the
-// maximum number of packets that the buffer can contain. If the limit is
-// exceeded, the buffer will be flushed. The capacity does not affect the actual
-// audio delay in the general case, since this is governed by the target buffer
-// level (calculated from the jitter profile). It is only in the rare case of
-// severe network freezes that a higher capacity will lead to a (transient)
-// increase in audio delay.
-struct NetEqCapacityConfig {
-  NetEqCapacityConfig() : enabled(false), capacity(0) {}
-  explicit NetEqCapacityConfig(int value) : enabled(true), capacity(value) {}
-  static const ConfigOptionID identifier = ConfigOptionID::kNetEqCapacityConfig;
-  bool enabled;
-  int capacity;
-};
-
-struct NetEqFastAccelerate {
-  NetEqFastAccelerate() : enabled(false) {}
-  explicit NetEqFastAccelerate(bool value) : enabled(value) {}
-  static const ConfigOptionID identifier = ConfigOptionID::kNetEqFastAccelerate;
-  bool enabled;
-};
-
-struct VoicePacing {
-  VoicePacing() : enabled(false) {}
-  explicit VoicePacing(bool value) : enabled(value) {}
-  static const ConfigOptionID identifier = ConfigOptionID::kVoicePacing;
-  bool enabled;
-};
-
 }  // namespace webrtc
 
 #endif  // WEBRTC_CONFIG_H_