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

Unified Diff: webrtc/voice_engine/voe_external_media_impl.cc

Issue 1986093002: Propagate muted info from VoE Channel to AudioConferenceMixer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@mixer-mod-3
Patch Set: Addressing kwiberg's comments 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/voice_engine/voe_external_media_impl.cc
diff --git a/webrtc/voice_engine/voe_external_media_impl.cc b/webrtc/voice_engine/voe_external_media_impl.cc
index 7b2b6a00f1e1d8094724b64a87159733ba5f04ab..cae0715ced2da3af353f8784b2f4c11814da1a15 100644
--- a/webrtc/voice_engine/voe_external_media_impl.cc
+++ b/webrtc/voice_engine/voe_external_media_impl.cc
@@ -153,7 +153,11 @@ int VoEExternalMediaImpl::GetAudioFrame(int channel, int desired_sample_rate_hz,
}
frame->sample_rate_hz_ =
desired_sample_rate_hz == 0 ? -1 : desired_sample_rate_hz;
- return channelPtr->GetAudioFrame(channel, frame);
+ auto ret = channelPtr->GetAudioFrameWithMuted(channel, frame);
+ if (ret == MixerParticipant::AudioFrameInfo::kMuted) {
+ frame->Mute();
minyue-webrtc 2016/05/17 14:59:17 I am confused, isn't this memset frame's samples t
hlundin-webrtc 2016/05/17 19:57:51 This is only the case in the VoEExternalMediaImpl,
minyue-webrtc 2016/05/18 01:31:30 Acknowledged.
+ }
+ return ret == MixerParticipant::AudioFrameInfo::kError ? -1 : 0;
}
int VoEExternalMediaImpl::SetExternalMixing(int channel, bool enable) {

Powered by Google App Engine
This is Rietveld 408576698