Stop using old AudioCodingModule::RegisterReceiveCodec overloads

webrtc/modules/audio_coding/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.
  */
 
 #include "TwoWayCommunication.h"
 
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <memory>
 
 #ifdef WIN32
 #include <Windows.h>
 #endif
 
 #include "webrtc/common_types.h"
+#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h"
 #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/modules/audio_coding/test/PCMFile.h"
 #include "webrtc/modules/audio_coding/test/utility.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/voice_engine_configurations.h"
 
 namespace webrtc {
 
@@ skipping 56 matching lines @@
   ChooseCodec(&codecID_A, &codecID_B);
   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));
+  EXPECT_EQ(true, _acmA->RegisterReceiveCodec(codecInst_B.pltype,
+                                              CodecInstToSdp(codecInst_B)));
   //--- Set ref-A codecs
   EXPECT_EQ(0, _acmRefA->RegisterSendCodec(codecInst_A));
-  EXPECT_EQ(0, _acmRefA->RegisterReceiveCodec(codecInst_B));
+  EXPECT_EQ(true, _acmRefA->RegisterReceiveCodec(codecInst_B.pltype,
+                                                 CodecInstToSdp(codecInst_B)));
 
   //--- Set B codecs
   EXPECT_EQ(0, _acmB->RegisterSendCodec(codecInst_B));
-  EXPECT_EQ(0, _acmB->RegisterReceiveCodec(codecInst_A));
+  EXPECT_EQ(true, _acmB->RegisterReceiveCodec(codecInst_A.pltype,
+                                              CodecInstToSdp(codecInst_A)));
 
   //--- Set ref-B codecs
   EXPECT_EQ(0, _acmRefB->RegisterSendCodec(codecInst_B));
-  EXPECT_EQ(0, _acmRefB->RegisterReceiveCodec(codecInst_A));
+  EXPECT_EQ(true, _acmRefB->RegisterReceiveCodec(codecInst_A.pltype,
+                                                 CodecInstToSdp(codecInst_A)));
 
   uint16_t frequencyHz;
 
   //--- Input A
   std::string in_file_name = webrtc::test::ResourcePath(
       "audio_coding/testfile32kHz", "pcm");
   frequencyHz = 32000;
   printf("Enter input file at side A [%s]: ", in_file_name.c_str());
   PCMFile::ChooseFile(&in_file_name, 499, &frequencyHz);
   _inFileA.Open(in_file_name, frequencyHz, "rb");
@@ skipping 45 matching lines @@
   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));
 
   //--- Set A codecs
   EXPECT_EQ(0, _acmA->RegisterSendCodec(codecInst_A));
-  EXPECT_EQ(0, _acmA->RegisterReceiveCodec(codecInst_B));
+  EXPECT_EQ(true, _acmA->RegisterReceiveCodec(codecInst_B.pltype,
+                                              CodecInstToSdp(codecInst_B)));
 
   //--- Set ref-A codecs
   EXPECT_GT(_acmRefA->RegisterSendCodec(codecInst_A), -1);
-  EXPECT_GT(_acmRefA->RegisterReceiveCodec(codecInst_B), -1);
+  EXPECT_EQ(true, _acmRefA->RegisterReceiveCodec(codecInst_B.pltype,
+                                                 CodecInstToSdp(codecInst_B)));
 
   //--- Set B codecs
   EXPECT_GT(_acmB->RegisterSendCodec(codecInst_B), -1);
-  EXPECT_GT(_acmB->RegisterReceiveCodec(codecInst_A), -1);
+  EXPECT_EQ(true, _acmB->RegisterReceiveCodec(codecInst_A.pltype,
+                                              CodecInstToSdp(codecInst_A)));
 
   //--- Set ref-B codecs
   EXPECT_EQ(0, _acmRefB->RegisterSendCodec(codecInst_B));
-  EXPECT_EQ(0, _acmRefB->RegisterReceiveCodec(codecInst_A));
+  EXPECT_EQ(true, _acmRefB->RegisterReceiveCodec(codecInst_A.pltype,
+                                                 CodecInstToSdp(codecInst_A)));
 
   uint16_t frequencyHz;
 
   //--- Input A and B
   std::string in_file_name = webrtc::test::ResourcePath(
       "audio_coding/testfile32kHz", "pcm");
   frequencyHz = 16000;
   _inFileA.Open(in_file_name, frequencyHz, "rb");
   _inFileB.Open(in_file_name, frequencyHz, "rb");
 
@@ skipping 85 matching lines @@
     // Re-register send codec on side B.
     if (((secPassed % 5) == 4) && (msecPassed >= 990)) {
       EXPECT_EQ(0, _acmB->RegisterSendCodec(*codecInst_B));
       EXPECT_TRUE(_acmB->SendCodec());
     }
     // Initialize receiver on side A.
     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));
+      EXPECT_EQ(true, _acmA->RegisterReceiveCodec(
+                          codecInst_B->pltype, CodecInstToSdp(*codecInst_B)));
     }
   }
 }
 
 }  // namespace webrtc