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

Unified Diff: webrtc/modules/audio_coding/acm2/acm_receiver.cc

Issue 1965733002: NetEq: Implement muted output (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@muted-expand
Patch Set: Created 4 years, 7 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/audio_coding/acm2/acm_receiver.cc
diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/acm2/acm_receiver.cc
index f8bacf8dc7d4a97ad4d267bb23d6a9f7bab35c2b..f0dc5fd57d345f230e23492457eb22bbb79b4703 100644
--- a/webrtc/modules/audio_coding/acm2/acm_receiver.cc
+++ b/webrtc/modules/audio_coding/acm2/acm_receiver.cc
@@ -137,10 +137,12 @@ int AcmReceiver::GetAudio(int desired_freq_hz, AudioFrame* audio_frame) {
// Accessing members, take the lock.
rtc::CritScope lock(&crit_sect_);
- if (neteq_->GetAudio(audio_frame) != NetEq::kOK) {
+ bool muted_output;
+ if (neteq_->GetAudio(audio_frame, &muted_output) != NetEq::kOK) {
LOG(LERROR) << "AcmReceiver::GetAudio - NetEq Failed.";
return -1;
}
+ RTC_DCHECK(!muted_output);
hlundin-webrtc 2016/05/10 12:28:15 This DCHECK will be removed when the functionality
const int current_sample_rate_hz = neteq_->last_output_sample_rate_hz();
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/neteq/include/neteq.h » ('j') | webrtc/modules/audio_coding/neteq/include/neteq.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698