Remove ACM AudioCodingFeedback callback object and derived classes

webrtc/modules/audio_coding/main/test/TwoWayCommunication.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.
  */
 
@@ skipping 78 matching lines @@
   CodecInst codecInst_A;
   CodecInst codecInst_B;
   CodecInst dummyCodec;
   EXPECT_EQ(0, _acmA->Codec(codecID_A, &codecInst_A));
   EXPECT_EQ(0, _acmB->Codec(codecID_B, &codecInst_B));
   EXPECT_EQ(0, _acmA->Codec(6, &dummyCodec));
 
   //--- 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));
 
   //--- 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));
   EXPECT_EQ(0, _acmRefB->RegisterReceiveCodec(codecInst_A));
 
   uint16_t frequencyHz;
 
   //--- Input A
   std::string in_file_name = webrtc::test::ResourcePath(
       "audio_coding/testfile32kHz", "pcm");
@@ skipping 55 matching lines @@
   CodecInst codecInst_B;
   CodecInst dummyCodec;
 
   EXPECT_EQ(0, _acmA->Codec("ISAC", &codecInst_A, 16000, 1));
   EXPECT_EQ(0, _acmB->Codec("L16", &codecInst_B, 8000, 1));
   EXPECT_EQ(0, _acmA->Codec(6, &dummyCodec));
 
   //--- 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);
   EXPECT_GT(_acmRefA->RegisterReceiveCodec(codecInst_B), -1);
 
   //--- 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));
   EXPECT_EQ(0, _acmRefB->RegisterReceiveCodec(codecInst_A));
 
   uint16_t frequencyHz;
 
   //--- Input A and B
   std::string in_file_name = webrtc::test::ResourcePath(
       "audio_coding/testfile32kHz", "pcm");
@@ skipping 97 matching lines @@
     if (((secPassed % 7) == 6) && (msecPassed == 0))
       EXPECT_EQ(0, _acmA->InitializeReceiver());
     // Re-register codec on side A.
     if (((secPassed % 7) == 6) && (msecPassed >= 990)) {
       EXPECT_EQ(0, _acmA->RegisterReceiveCodec(codecInst_B));
     }
   }
 }
 
 }  // namespace webrtc