ACM: Removing runtime APIs related to playout mode

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 14 matching lines @@
 #include "webrtc/modules/audio_coding/main/test/utility.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 
 #define MAX_FILE_NAME_LENGTH_BYTE 500
 
 TwoWayCommunication::TwoWayCommunication(int testMode)
     : _acmA(AudioCodingModule::Create(1)),
-      _acmB(AudioCodingModule::Create(2)),
       _acmRefA(AudioCodingModule::Create(3)),
-      _acmRefB(AudioCodingModule::Create(4)),
-      _testMode(testMode) {}
+      _testMode(testMode) {
+  AudioCodingModule::Config config;
+  // The clicks will be more obvious in FAX mode. TODO(henrik.lundin) Really?
+  config.neteq_config.playout_mode = kPlayoutFax;
+  config.id = 2;
+  _acmB.reset(AudioCodingModule::Create(config));
+  config.id = 4;
+  _acmRefB.reset(AudioCodingModule::Create(config));
+}
 
 TwoWayCommunication::~TwoWayCommunication() {
   delete _channel_A2B;
   delete _channel_B2A;
   delete _channelRef_A2B;
   delete _channelRef_B2A;
 #ifdef WEBRTC_DTMF_DETECTION
   if (_dtmfDetectorA != NULL) {
     delete _dtmfDetectorA;
   }
@@ skipping 103 matching lines @@
   _channelRef_A2B->RegisterReceiverACM(_acmRefB.get());
 
   //--- Set B-to-A channel
   _channel_B2A = new Channel;
   _acmB->RegisterTransportCallback(_channel_B2A);
   _channel_B2A->RegisterReceiverACM(_acmA.get());
   //--- Do the same for reference
   _channelRef_B2A = new Channel;
   _acmRefB->RegisterTransportCallback(_channelRef_B2A);
   _channelRef_B2A->RegisterReceiverACM(_acmRefA.get());
-
-  // The clicks will be more obvious when we
-  // are in FAX mode.
-  EXPECT_EQ(_acmB->SetPlayoutMode(fax), 0);
-  EXPECT_EQ(_acmRefB->SetPlayoutMode(fax), 0);
 }
 
 void TwoWayCommunication::SetUpAutotest() {
   CodecInst codecInst_A;
   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));
@@ skipping 49 matching lines @@
   _channelRef_A2B->RegisterReceiverACM(_acmRefB.get());
 
   //--- Set B-to-A channel
   _channel_B2A = new Channel;
   _acmB->RegisterTransportCallback(_channel_B2A);
   _channel_B2A->RegisterReceiverACM(_acmA.get());
   //--- Do the same for reference
   _channelRef_B2A = new Channel;
   _acmRefB->RegisterTransportCallback(_channelRef_B2A);
   _channelRef_B2A->RegisterReceiverACM(_acmRefA.get());
-
-  // The clicks will be more obvious when we
-  // are in FAX mode.
-  EXPECT_EQ(0, _acmB->SetPlayoutMode(fax));
-  EXPECT_EQ(0, _acmRefB->SetPlayoutMode(fax));
 }
 
 void TwoWayCommunication::Perform() {
   if (_testMode == 0) {
     SetUpAutotest();
   } else {
     SetUp();
   }
   unsigned int msecPassed = 0;
   unsigned int secPassed = 0;
@@ skipping 45 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