summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc')
-rw-r--r--chromium/third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc b/chromium/third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc
index aa8e8be0637..a4808c0e384 100644
--- a/chromium/third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc
+++ b/chromium/third_party/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc
@@ -26,7 +26,7 @@ namespace acm2 {
// Enum for CNG
enum {
kMaxPLCParamsCNG = WEBRTC_CNG_MAX_LPC_ORDER,
- kNewCNGNumPLCParams = 8
+ kNewCNGNumLPCParams = 8
};
// Interval for sending new CNG parameters (SID frames) is 100 msec.
@@ -56,9 +56,10 @@ ACMGenericCodec::ACMGenericCodec()
vad_mode_(VADNormal),
dtx_enabled_(false),
ptr_dtx_inst_(NULL),
- num_lpc_params_(kNewCNGNumPLCParams),
+ num_lpc_params_(kNewCNGNumLPCParams),
sent_cn_previous_(false),
prev_frame_cng_(0),
+ has_internal_fec_(false),
neteq_decode_lock_(NULL),
codec_wrapper_lock_(*RWLockWrapper::CreateRWLock()),
last_timestamp_(0xD87F3F9F),
@@ -546,7 +547,7 @@ void ACMGenericCodec::DestructEncoder() {
WebRtcCng_FreeEnc(ptr_dtx_inst_);
ptr_dtx_inst_ = NULL;
}
- num_lpc_params_ = kNewCNGNumPLCParams;
+ num_lpc_params_ = kNewCNGNumLPCParams;
DestructEncoderSafe();
}