From ee646c37d4ff86738edc9f3718f3f7428f5f656a Mon Sep 17 00:00:00 2001 From: "niklas.enbom@webrtc.org" Date: Thu, 24 May 2012 11:41:02 +0000 Subject: [PATCH] I know this is ugly, but it helps a lot to quickly update webRTC in Chrome and libJingle. Review URL: https://webrtc-codereview.appspot.com/596004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2290 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/voice_engine/main/interface/voe_audio_processing.h | 4 ++-- src/voice_engine/main/source/transmit_mixer.cc | 2 +- src/voice_engine/main/source/voe_audio_processing_impl.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/voice_engine/main/interface/voe_audio_processing.h b/src/voice_engine/main/interface/voe_audio_processing.h index 7ea95e1fc2..0e014877c2 100644 --- a/src/voice_engine/main/interface/voe_audio_processing.h +++ b/src/voice_engine/main/interface/voe_audio_processing.h @@ -200,13 +200,13 @@ public: // Optional setting of typing detection parameters // Parameter with value == 0 will be ignored - // and left with default config. + // TODO(niklase) Remove default argument as soon as libJingle is updated! virtual int SetTypingDetectionParameters(int timeWindow, int costPerTyping, int reportingThreshold, int penaltyDecay, - int typeEventDelay) = 0; + int typeEventDelay = 0) = 0; // Swaps the capture-side left and right audio channels when enabled. It // only has an effect when using a stereo send codec. The setting is diff --git a/src/voice_engine/main/source/transmit_mixer.cc b/src/voice_engine/main/source/transmit_mixer.cc index 95eddec8a3..9465749594 100644 --- a/src/voice_engine/main/source/transmit_mixer.cc +++ b/src/voice_engine/main/source/transmit_mixer.cc @@ -1467,7 +1467,7 @@ int TransmitMixer::SetTypingDetectionParameters(int timeWindow, if(penaltyDecay != 0) _penaltyDecay = penaltyDecay; if(_typeEventDelay != 0) - _penaltyDecay = _typeEventDelay; + _typeEventDelay = typeEventDelay; return(0); diff --git a/src/voice_engine/main/source/voe_audio_processing_impl.h b/src/voice_engine/main/source/voe_audio_processing_impl.h index af417e7219..a4e7e2203b 100644 --- a/src/voice_engine/main/source/voe_audio_processing_impl.h +++ b/src/voice_engine/main/source/voe_audio_processing_impl.h @@ -88,11 +88,12 @@ class VoEAudioProcessingImpl : public VoEAudioProcessing { virtual int TimeSinceLastTyping(int &seconds); + // TODO(niklase) Remove default argument as soon as libJingle is updated! virtual int SetTypingDetectionParameters(int timeWindow, int costPerTyping, int reportingThreshold, int penaltyDecay, - int typeEventDelay); + int typeEventDelay = 0); virtual void EnableStereoChannelSwapping(bool enable); virtual bool IsStereoChannelSwappingEnabled();