Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/

webrtc/voice_engine/dtmf_inband.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
 #include "webrtc/voice_engine/dtmf_inband.h"
 
 #include <assert.h>
 
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 
 const int16_t Dtmf_a_times2Tab8Khz[8]=
 {
         27978, 26956, 25701, 24219,
         19073, 16325, 13085, 9314
 };
 
@@ skipping 33 matching lines @@
         8090,       7210,       6426,       5727,       5104,       4549,
         4054,       3614,       3221,       2870,       2558,       2280,
         2032,       1811,       1614,       1439,       1282,       1143,
         1018,        908,        809,        721,        643,        573,
          510,        455,        405,        361,        322,        287,
                  256
 };
 
 
 DtmfInband::DtmfInband(int32_t id) :
-    _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
     _id(id),
     _outputFrequencyHz(8000),
     _frameLengthSamples(0),
     _remainingSamples(0),
     _eventCode(0),
     _attenuationDb(0),
     _lengthMs(0),
     _reinit(true),
     _playing(false),
     _delaySinceLastToneMS(1000)
 {
     memset(_oldOutputLow, 0, sizeof(_oldOutputLow));
     memset(_oldOutputHigh, 0, sizeof(_oldOutputHigh));
 }
 
 DtmfInband::~DtmfInband()
 {
-        delete &_critSect;
 }
 
 int
 DtmfInband::SetSampleRate(uint16_t frequency)
 {
     if (frequency != 8000 &&
             frequency != 16000 &&
             frequency != 32000)
     {
         // invalid sample rate
         assert(false);
         return -1;
     }
     _outputFrequencyHz = frequency;
     return 0;
 }
 
 int
 DtmfInband::GetSampleRate(uint16_t& frequency)
 {
     frequency = _outputFrequencyHz;
     return 0;
 }
 
-void 
+void
 DtmfInband::Init()
 {
     _remainingSamples = 0;
     _frameLengthSamples = 0;
     _eventCode = 0;
     _attenuationDb = 0;
     _lengthMs = 0;
     _reinit = true;
     _oldOutputLow[0] = 0;
     _oldOutputLow[1] = 0;
     _oldOutputHigh[0] = 0;
     _oldOutputHigh[1] = 0;
     _delaySinceLastToneMS = 1000;
 }
 
 int
 DtmfInband::AddTone(uint8_t eventCode,
                     int32_t lengthMs,
                     int32_t attenuationDb)
 {
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     if (attenuationDb > 36 || eventCode > 15)
     {
         assert(false);
         return -1;
     }
 
     if (IsAddingTone())
     {
         WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_id,-1),
                    "DtmfInband::AddTone() new tone interrupts ongoing tone");
     }
 
     ReInit();
 
     _frameLengthSamples = static_cast<int16_t> (_outputFrequencyHz / 100);
     _eventCode = static_cast<int16_t> (eventCode);
     _attenuationDb = static_cast<int16_t> (attenuationDb);
     _remainingSamples = static_cast<int32_t>
         (lengthMs * (_outputFrequencyHz / 1000));
     _lengthMs = lengthMs;
 
     return 0;
 }
 
 int
 DtmfInband::ResetTone()
 {
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     ReInit();
 
     _frameLengthSamples = static_cast<int16_t> (_outputFrequencyHz / 100);
     _remainingSamples = static_cast<int32_t>
         (_lengthMs * (_outputFrequencyHz / 1000));
 
     return 0;
 }
 
 int
 DtmfInband::StartTone(uint8_t eventCode,
                       int32_t attenuationDb)
 {
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     if (attenuationDb > 36 || eventCode > 15)
     {
         assert(false);
         return -1;
     }
 
     if (IsAddingTone())
     {
             return -1;
     }
 
     ReInit();
 
     _frameLengthSamples = static_cast<int16_t> (_outputFrequencyHz / 100);
     _eventCode = static_cast<int16_t> (eventCode);
     _attenuationDb = static_cast<int16_t> (attenuationDb);
     _playing = true;
 
     return 0;
 }
 
 int
 DtmfInband::StopTone()
 {
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     if (!_playing)
     {
         return 0;
     }
 
     _playing = false;
 
     return 0;
 }
 
 // Shall be called between tones
-void 
+void
 DtmfInband::ReInit()
 {
     _reinit = true;
 }
 
-bool 
+bool
 DtmfInband::IsAddingTone()
 {
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
     return (_remainingSamples > 0 || _playing);
 }
 
 int
 DtmfInband::Get10msTone(int16_t output[320],
                         uint16_t& outputSizeInSamples)
 {
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
     if (DtmfFix_generate(output,
                          _eventCode,
                          _attenuationDb,
                          _frameLengthSamples,
                          _outputFrequencyHz) == -1)
     {
         return -1;
     }
     _remainingSamples -= _frameLengthSamples;
     outputSizeInSamples = _frameLengthSamples;
     _delaySinceLastToneMS = 0;
     return 0;
 }
 
 void
 DtmfInband::UpdateDelaySinceLastTone()
 {
     _delaySinceLastToneMS += kDtmfFrameSizeMs;

[the sun, 2016/01/21 13:07:28]

Add CritScope; there's a a race with this function and the one above.

[tommi, 2016/01/21 15:29:23]

Done.

     // avoid wraparound
     if (_delaySinceLastToneMS > (1<<30))
     {
         _delaySinceLastToneMS = 1000;
     }
 }
 
 uint32_t
 DtmfInband::DelaySinceLastTone() const
 {
     return _delaySinceLastToneMS;

[the sun, 2016/01/21 13:07:28]

Add CritScope to avoid TSAN warnings?

[tommi, 2016/01/21 15:29:23]

Done.

 }
 
 int16_t
 DtmfInband::DtmfFix_generate(int16_t *decoded,
                              int16_t value,
                              int16_t volume,
                              int16_t frameLen,
                              int16_t fs)
 {
     const int16_t *a_times2Tbl;
@@ skipping 108 matching lines @@
         tempVal=(tempVal+16384)>>15;
 
         /* Scale the signal to correct dbM0 value */
         signal[i]=(int16_t)((tempVal*Dtmf_dBm0kHz[volume]+8192)>>14);
     }
 
     return(0);
 }
 
 }  // namespace webrtc