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

Unified Diff: webrtc/modules/utility/source/coder.cc

Issue 2388153004: Stop using old AudioCodingModule::RegisterReceiveCodec overloads (Closed)
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
Index: webrtc/modules/utility/source/coder.cc
diff --git a/webrtc/modules/utility/source/coder.cc b/webrtc/modules/utility/source/coder.cc
index f72d03b887de9356df67d44bb20f7d8963f868c5..71f969097fd218365b015d00c6a3b3b8fbeaf8b2 100644
--- a/webrtc/modules/utility/source/coder.cc
+++ b/webrtc/modules/utility/source/coder.cc
@@ -9,6 +9,7 @@
*/
#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/include/module_common_types.h"
#include "webrtc/modules/utility/source/coder.h"
@@ -45,9 +46,8 @@ int32_t AudioCoder::SetEncodeCodec(const CodecInst& codec_inst) {
}
int32_t AudioCoder::SetDecodeCodec(const CodecInst& codec_inst) {
- if (acm_->RegisterReceiveCodec(codec_inst, [&] {
- return rent_a_codec_.RentIsacDecoder(codec_inst.plfreq);
- }) == -1) {
+ if (!acm_->RegisterReceiveCodec(codec_inst.pltype,
+ CodecInstToSdp(codec_inst))) {
return -1;
}
memcpy(&receive_codec_, &codec_inst, sizeof(CodecInst));

Powered by Google App Engine
This is Rietveld 408576698