zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using old AudioCodingModule::RegisterReceiveCodec overloads

Browse Source 
BUG=webrtc:5801

Review-Url: https://codereview.webrtc.org/2388153004
Cr-Commit-Position: refs/heads/master@{#14753}
This commit is contained in:
kwiberg
2016-10-24 13:47:09 -07:00
committed by Commit bot
parent 88b7074745
commit da2bf4e150
24 changed files with 202 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/utility/source/coder.cc
View File

@ -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));