generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In streaming mode it is preferable to fade to silence when sender stops sending, or long period of packet loss.

Browse Source 
test=try bots.
Review URL: https://webrtc-codereview.appspot.com/1272004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3771 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turaj@webrtc.org
2013-04-06 00:08:11 +00:00
parent 19da719a5f
commit 2e6b7e938f
1 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
webrtc/modules/audio_coding/main/source/acm_neteq.cc
View File

@@ -323,38 +323,51 @@ WebRtc_Word32 ACMNetEQ::CurrentSampFreqHz() const {
WebRtc_Word32 ACMNetEQ::SetPlayoutMode(const AudioPlayoutMode mode) { WebRtc_Word32 ACMNetEQ::SetPlayoutMode(const AudioPlayoutMode mode) {
CriticalSectionScoped lock(neteq_crit_sect_); CriticalSectionScoped lock(neteq_crit_sect_);
if (playout_mode_ != mode) { if (playout_mode_ == mode)
for (WebRtc_Word16 idx = 0; idx < num_slaves_ + 1; idx++) { return 0;
if (!is_initialized_[idx]) {
WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_,
"SetPlayoutMode: NetEq is not initialized.");
return -1;
}
enum WebRtcNetEQPlayoutMode playout_mode = kPlayoutOff; enum WebRtcNetEQPlayoutMode playout_mode = kPlayoutOff;
switch (mode) { enum WebRtcNetEQBGNMode background_noise_mode = kBGNOn;
case voice: switch (mode) {
playout_mode = kPlayoutOn; case voice:
break; playout_mode = kPlayoutOn;
case fax: background_noise_mode = kBGNOn;
playout_mode = kPlayoutFax; break;
break; case fax:
case streaming: playout_mode = kPlayoutFax;
playout_mode = kPlayoutStreaming; WebRtcNetEQ_GetBGNMode(inst_[0], &background_noise_mode); // No change.
break; break;
case off: case streaming:
playout_mode = kPlayoutOff; playout_mode = kPlayoutStreaming;
break; background_noise_mode = kBGNOff;
} break;
if (WebRtcNetEQ_SetPlayoutMode(inst_[idx], playout_mode) < 0) { case off:
LogError("SetPlayoutMode", idx); playout_mode = kPlayoutOff;
return -1; background_noise_mode = kBGNOff;
} break;
}
playout_mode_ = mode;
} }
return 0; int err = 0;
for (WebRtc_Word16 idx = 0; idx < num_slaves_ + 1; idx++) {
if (!is_initialized_[idx]) {
WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_,
"SetPlayoutMode: NetEq is not initialized.");
return -1;
}
if (WebRtcNetEQ_SetPlayoutMode(inst_[idx], playout_mode) < 0) {
LogError("SetPlayoutMode", idx);
err = -1;
}
if (WebRtcNetEQ_SetBGNMode(inst_[idx], kBGNOff) < 0) {
LogError("SetPlayoutMode::SetBGNMode", idx);
err = -1;
}
}
if (err == 0)
playout_mode_ = mode;
return err;
} }
AudioPlayoutMode ACMNetEQ::playout_mode() const { AudioPlayoutMode ACMNetEQ::playout_mode() const {