| Index: webrtc/modules/audio_coding/acm2/audio_coding_module.cc
|
| diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module.cc
|
| index 5ff28ab043838ad43ab91aa3c30acbd089672109..63f15a02833b8b71fb2b9eadf4f13395689c4306 100644
|
| --- a/webrtc/modules/audio_coding/acm2/audio_coding_module.cc
|
| +++ b/webrtc/modules/audio_coding/acm2/audio_coding_module.cc
|
| @@ -16,6 +16,7 @@
|
| #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
|
| #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
|
| #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
|
| +#include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h"
|
| #include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
|
| #include "webrtc/system_wrappers/include/metrics.h"
|
| #include "webrtc/system_wrappers/include/trace.h"
|
| @@ -949,9 +950,7 @@ int AudioCodingModuleImpl::InitializeReceiverSafe() {
|
| auto db = acm2::RentACodec::Database();
|
| for (size_t i = 0; i < db.size(); i++) {
|
| if (IsCodecRED(db[i]) || IsCodecCN(db[i])) {
|
| - if (receiver_.AddCodec(static_cast<int>(i),
|
| - static_cast<uint8_t>(db[i].pltype), 1,
|
| - db[i].plfreq, nullptr, db[i].plname) < 0) {
|
| + if (!receiver_.AddCodec(db[i].pltype, CodecInstToSdp(db[i]))) {
|
| WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_,
|
| "Cannot register master codec.");
|
| return -1;
|
|
|