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

Move the stereo-disables-CNG logic from CodecManager to Rent-A-Codec

Browse Source 
BUG=webrtc:5028

Review URL: https://codereview.webrtc.org/1473563004

Cr-Commit-Position: refs/heads/master@{#10784}
This commit is contained in:
kwiberg
2015-11-25 01:19:13 -08:00
committed by Commit bot
parent 46a491bcbb
commit 989b4abcf3
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/audio_coding/main/acm2/codec_manager.cc
View File

@ -149,15 +149,6 @@ int CodecManager::RegisterEncoder(const CodecInst& send_codec) {
break;
}
// Set Stereo, and make sure VAD and DTX is turned off.
if (send_codec.channels != 1) {
if (codec_stack_params_.use_cng) {
WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceAudioCoding, dummy_id,
"VAD/DTX is turned off, not supported when sending stereo.");
}
codec_stack_params_.use_cng = false;
}
// Check if the codec is already registered as send codec.
bool new_codec = true;
if (CurrentEncoder()) {
@ -231,8 +222,6 @@ void CodecManager::RegisterEncoder(AudioEncoder* external_speech_encoder) {
static const char kName[] = "external";
memcpy(send_codec_inst_.plname, kName, sizeof(kName));
if (send_codec_inst_.channels != 1)
codec_stack_params_.use_cng = false;
if (codec_stack_params_.use_codec_fec) {
// Switch FEC on. On failure, remember that FEC is off.
if (!external_speech_encoder->SetFec(true))

3
webrtc/modules/audio_coding/main/acm2/rent_a_codec.cc
View File

@ -259,7 +259,8 @@ AudioEncoder* RentACodec::RentEncoderStack(AudioEncoder* speech_encoder,
: rtc::Optional<int>(it->second);
};
auto cng_pt = pt(param->cng_payload_types);
param->use_cng = param->use_cng && cng_pt;
param->use_cng =
param->use_cng && cng_pt && speech_encoder->NumChannels() == 1;
auto red_pt = pt(param->red_payload_types);
param->use_red = param->use_red && red_pt;