admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable muted state by default in VoE

Browse Source 
This change turns muted state on by default in VoiceEngine, but not
for NetEq or AudioCodingModule when used stand-alone.

The expected effect is that voice channels that have not received any
packets for some time should reduce their CPU usage. This should have
a noticeable effect on endpoints with many incoming streams, but where
only a few have packets incoming at any given time (i.e., where an
intermediate server filters out the majority of the streams).

BUG=webrtc:5606
NOTRY=True

Review-Url: https://codereview.webrtc.org/1987143003
Cr-Commit-Position: refs/heads/master@{#12797}
This commit is contained in:
henrik.lundin 2016-05-18 08:52:45 -07:00 committed by Commit bot
parent a3c2c3e606
commit a89ab965f2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/voice_engine/channel.cc
View File

@ -496,7 +496,13 @@ MixerParticipant::AudioFrameInfo Channel::GetAudioFrameWithMuted(
// irrelevant.
return MixerParticipant::AudioFrameInfo::kError;
}
RTC_DCHECK(!muted);
if (muted) {
// TODO(henrik.lundin): We should be able to do better than this. But we
// will have to go through all the cases below where the audio samples may
// be used, and handle the muted case in some way.
audioFrame->Mute();
}
if (_RxVadDetection) {
UpdateRxVadDetection(*audioFrame);
@ -567,6 +573,7 @@ MixerParticipant::AudioFrameInfo Channel::GetAudioFrameWithMuted(
// Mix decoded PCM output with file if file mixing is enabled
if (state.output_file_playing) {
MixAudioWithFile(*audioFrame, audioFrame->sample_rate_hz_);
muted = false; // We may have added non-zero samples.
}
// External media
@ -591,6 +598,7 @@ MixerParticipant::AudioFrameInfo Channel::GetAudioFrameWithMuted(
}
// Measure audio level (0-9)
// TODO(henrik.lundin) Use the |muted| information here too.
_outputAudioLevel.ComputeLevel(*audioFrame);
if (capture_start_rtp_time_stamp_ < 0 && audioFrame->timestamp_ != 0) {
@ -816,7 +824,7 @@ Channel::Channel(int32_t channelId,
}
acm_config.neteq_config.enable_fast_accelerate =
config.Get<NetEqFastAccelerate>().enabled;
acm_config.neteq_config.enable_muted_state = false;
acm_config.neteq_config.enable_muted_state = true;
audio_coding_.reset(AudioCodingModule::Create(acm_config));
_outputAudioLevel.Clear();