Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Unified Diff: webrtc/modules/audio_coding/acm2/audio_coding_module.cc

Issue 2393873002: Remove old AcmReceiver::AddCodec overload
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698