Stop using old AudioCodingModule::RegisterReceiveCodec overloads

webrtc/modules/audio_coding/acm2/acm_receive_test.cc

 /*
  *  Copyright (c) 2014 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/modules/audio_coding/acm2/acm_receive_test.h"
 
 #include <assert.h>
 #include <stdio.h>
 
 #include <memory>
 
+#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/include/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/neteq/tools/audio_sink.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 namespace test {
 
@@ skipping 97 matching lines @@
       output_freq_hz_(output_freq_hz),
       exptected_output_channels_(exptected_output_channels) {}
 
 AcmReceiveTestOldApi::~AcmReceiveTestOldApi() = default;
 
 void AcmReceiveTestOldApi::RegisterDefaultCodecs() {
   CodecInst my_codec_param;
   for (int n = 0; n < acm_->NumberOfCodecs(); n++) {
     ASSERT_EQ(0, acm_->Codec(n, &my_codec_param)) << "Failed to get codec.";
     if (ModifyAndUseThisCodec(&my_codec_param)) {
-      ASSERT_EQ(0, acm_->RegisterReceiveCodec(my_codec_param))
+      ASSERT_EQ(true,
+                acm_->RegisterReceiveCodec(my_codec_param.pltype,
+                                           CodecInstToSdp(my_codec_param)))
           << "Couldn't register receive codec.\n";
     }
   }
 }
 
 void AcmReceiveTestOldApi::RegisterNetEqTestCodecs() {
   CodecInst my_codec_param;
   for (int n = 0; n < acm_->NumberOfCodecs(); n++) {
     ASSERT_EQ(0, acm_->Codec(n, &my_codec_param)) << "Failed to get codec.";
     if (!ModifyAndUseThisCodec(&my_codec_param)) {
       // Skip this codec.
       continue;
     }
 
     if (RemapPltypeAndUseThisCodec(my_codec_param.plname,
                                    my_codec_param.plfreq,
                                    my_codec_param.channels,
                                    &my_codec_param.pltype)) {
-      ASSERT_EQ(0, acm_->RegisterReceiveCodec(my_codec_param))
+      ASSERT_EQ(true,
+                acm_->RegisterReceiveCodec(my_codec_param.pltype,
+                                           CodecInstToSdp(my_codec_param)))
           << "Couldn't register receive codec.\n";
     }
   }
 }
 
-int AcmReceiveTestOldApi::RegisterExternalReceiveCodec(
-    int rtp_payload_type,
-    AudioDecoder* external_decoder,
-    int sample_rate_hz,
-    int num_channels,
-    const std::string& name) {
-  return acm_->RegisterExternalReceiveCodec(rtp_payload_type, external_decoder,
-                                            sample_rate_hz, num_channels, name);
-}
-
 void AcmReceiveTestOldApi::Run() {
   for (std::unique_ptr<Packet> packet(packet_source_->NextPacket()); packet;
        packet = packet_source_->NextPacket()) {
     // Pull audio until time to insert packet.
     while (clock_.TimeInMilliseconds() < packet->time_ms()) {
       AudioFrame output_frame;
       bool muted;
       EXPECT_EQ(0,
                 acm_->PlayoutData10Ms(output_freq_hz_, &output_frame, &muted));
       ASSERT_EQ(output_freq_hz_, output_frame.sample_rate_hz_);
@@ skipping 53 matching lines @@
   if (clock_.TimeInMilliseconds() >= last_toggle_time_ms_ + toggle_period_ms_) {
     output_freq_hz_ = (output_freq_hz_ == output_freq_hz_1_)
                           ? output_freq_hz_2_
                           : output_freq_hz_1_;
     last_toggle_time_ms_ = clock_.TimeInMilliseconds();
   }
 }
 
 }  // namespace test
 }  // namespace webrtc