diff --git a/webrtc/engine_configurations.h b/webrtc/engine_configurations.h index 5963892e5a..f59fd3ec26 100644 --- a/webrtc/engine_configurations.h +++ b/webrtc/engine_configurations.h @@ -107,10 +107,4 @@ #define EAGL_RENDERING #endif -// ---------------------------------------------------------------------------- -// Deprecated -// ---------------------------------------------------------------------------- - -// #define WEBRTC_DTMF_DETECTION - #endif // WEBRTC_ENGINE_CONFIGURATIONS_H_ diff --git a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h index 81ad5c30a8..a585605d7c 100644 --- a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h +++ b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h @@ -46,15 +46,6 @@ class AudioPacketizationCallback { const RTPFragmentationHeader* fragmentation) = 0; }; -// Callback class used for inband Dtmf detection -class AudioCodingFeedback { - public: - virtual ~AudioCodingFeedback() {} - - virtual int32_t IncomingDtmf(const uint8_t digit_dtmf, - const bool end) = 0; -}; - // Callback class used for reporting VAD decision class ACMVADCallback { public: diff --git a/webrtc/modules/audio_coding/main/test/APITest.cc b/webrtc/modules/audio_coding/main/test/APITest.cc index 73f2d2adc7..3c485fd9c2 100644 --- a/webrtc/modules/audio_coding/main/test/APITest.cc +++ b/webrtc/modules/audio_coding/main/test/APITest.cc @@ -86,7 +86,6 @@ APITest::APITest(const Config& config) _dotMoveDirectionA(1), _dotPositionB(39), _dotMoveDirectionB(-1), - _dtmfCallback(NULL), _vadCallbackA(NULL), _vadCallbackB(NULL), _apiTestRWLock(*RWLockWrapper::CreateRWLock()), @@ -125,7 +124,6 @@ APITest::~APITest() { _inFileB.Close(); _outFileB.Close(); - DELETE_POINTER(_dtmfCallback); DELETE_POINTER(_vadCallbackA); DELETE_POINTER(_vadCallbackB); @@ -290,9 +288,6 @@ int16_t APITest::SetUp() { } } -#ifdef WEBRTC_DTMF_DETECTION - _dtmfCallback = new DTMFDetector; -#endif _vadCallbackA = new VADCallback; _vadCallbackB = new VADCallback; diff --git a/webrtc/modules/audio_coding/main/test/APITest.h b/webrtc/modules/audio_coding/main/test/APITest.h index c287243810..97d8774c4a 100644 --- a/webrtc/modules/audio_coding/main/test/APITest.h +++ b/webrtc/modules/audio_coding/main/test/APITest.h @@ -153,7 +153,6 @@ class APITest : public ACMTest { char _movingDot[41]; - DTMFDetector* _dtmfCallback; VADCallback* _vadCallbackA; VADCallback* _vadCallbackB; RWLockWrapper& _apiTestRWLock; diff --git a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc index 860e7da52b..8b75c7b6d5 100644 --- a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc +++ b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc @@ -96,11 +96,6 @@ void TwoWayCommunication::SetUp() { //--- Set A codecs EXPECT_EQ(0, _acmA->RegisterSendCodec(codecInst_A)); EXPECT_EQ(0, _acmA->RegisterReceiveCodec(codecInst_B)); -#ifdef WEBRTC_DTMF_DETECTION - _dtmfDetectorA = new(DTMFDetector); - EXPECT_GT(_acmA->RegisterIncomingMessagesCallback(_dtmfDetectorA, ACMUSA), - -1); -#endif //--- Set ref-A codecs EXPECT_EQ(0, _acmRefA->RegisterSendCodec(codecInst_A)); EXPECT_EQ(0, _acmRefA->RegisterReceiveCodec(codecInst_B)); @@ -108,11 +103,6 @@ void TwoWayCommunication::SetUp() { //--- Set B codecs EXPECT_EQ(0, _acmB->RegisterSendCodec(codecInst_B)); EXPECT_EQ(0, _acmB->RegisterReceiveCodec(codecInst_A)); -#ifdef WEBRTC_DTMF_DETECTION - _dtmfDetectorB = new(DTMFDetector); - EXPECT_GT(_acmB->RegisterIncomingMessagesCallback(_dtmfDetectorB, ACMUSA), - -1); -#endif //--- Set ref-B codecs EXPECT_EQ(0, _acmRefB->RegisterSendCodec(codecInst_B)); @@ -188,10 +178,6 @@ void TwoWayCommunication::SetUpAutotest() { //--- Set A codecs EXPECT_EQ(0, _acmA->RegisterSendCodec(codecInst_A)); EXPECT_EQ(0, _acmA->RegisterReceiveCodec(codecInst_B)); -#ifdef WEBRTC_DTMF_DETECTION - _dtmfDetectorA = new(DTMFDetector); - EXPECT_EQ(0, _acmA->RegisterIncomingMessagesCallback(_dtmfDetectorA, ACMUSA)); -#endif //--- Set ref-A codecs EXPECT_GT(_acmRefA->RegisterSendCodec(codecInst_A), -1); @@ -200,10 +186,6 @@ void TwoWayCommunication::SetUpAutotest() { //--- Set B codecs EXPECT_GT(_acmB->RegisterSendCodec(codecInst_B), -1); EXPECT_GT(_acmB->RegisterReceiveCodec(codecInst_A), -1); -#ifdef WEBRTC_DTMF_DETECTION - _dtmfDetectorB = new(DTMFDetector); - EXPECT_EQ(0, _acmB->RegisterIncomingMessagesCallback(_dtmfDetectorB, ACMUSA)); -#endif //--- Set ref-B codecs EXPECT_EQ(0, _acmRefB->RegisterSendCodec(codecInst_B)); diff --git a/webrtc/modules/audio_coding/main/test/utility.cc b/webrtc/modules/audio_coding/main/test/utility.cc index e4e6dd4a35..949ca617b2 100644 --- a/webrtc/modules/audio_coding/main/test/utility.cc +++ b/webrtc/modules/audio_coding/main/test/utility.cc @@ -279,32 +279,6 @@ bool FixedPayloadTypeCodec(const char* payloadName) { return false; } -DTMFDetector::DTMFDetector() { - for (int16_t n = 0; n < 1000; n++) { - _toneCntr[n] = 0; - } -} - -DTMFDetector::~DTMFDetector() { -} - -int32_t DTMFDetector::IncomingDtmf(const uint8_t digitDtmf, - const bool /* toneEnded */) { - fprintf(stdout, "%d-", digitDtmf); - _toneCntr[digitDtmf]++; - return 0; -} - -void DTMFDetector::PrintDetectedDigits() { - for (int16_t n = 0; n < 1000; n++) { - if (_toneCntr[n] > 0) { - fprintf(stdout, "%d %u msec, \n", n, _toneCntr[n] * 10); - } - } - fprintf(stdout, "\n"); - return; -} - void VADCallback::Reset() { memset(_numFrameTypes, 0, sizeof(_numFrameTypes)); } diff --git a/webrtc/modules/audio_coding/main/test/utility.h b/webrtc/modules/audio_coding/main/test/utility.h index eccb68f6d1..6998538ddd 100644 --- a/webrtc/modules/audio_coding/main/test/utility.h +++ b/webrtc/modules/audio_coding/main/test/utility.h @@ -115,19 +115,6 @@ void PrintCodecs(); bool FixedPayloadTypeCodec(const char* payloadName); -class DTMFDetector : public AudioCodingFeedback { - public: - DTMFDetector(); - ~DTMFDetector(); - // used for inband DTMF detection - int32_t IncomingDtmf(const uint8_t digitDtmf, const bool toneEnded); - void PrintDetectedDigits(); - - private: - uint32_t _toneCntr[1000]; - -}; - class VADCallback : public ACMVADCallback { public: VADCallback();