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

Unified Diff: talk/media/webrtc/webrtcvoiceengine.cc

Issue 1311533009: - Rename VoiceChannel::MuteStream() -> SetAudioSend() (incl. media channel) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@lj_remove_typingmonitor_files
Patch Set: rebase+one more test Created 5 years, 3 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: talk/media/webrtc/webrtcvoiceengine.cc
diff --git a/talk/media/webrtc/webrtcvoiceengine.cc b/talk/media/webrtc/webrtcvoiceengine.cc
index bcf1738c85138f355395397983e6887aee1ab54e..9e0cea98fc6ee54fd19c8ea62879706c0f519290 100644
--- a/talk/media/webrtc/webrtcvoiceengine.cc
+++ b/talk/media/webrtc/webrtcvoiceengine.cc
@@ -2374,6 +2374,22 @@ bool WebRtcVoiceMediaChannel::ChangeSend(int channel, SendFlags send) {
return true;
}
+bool WebRtcVoiceMediaChannel::SetAudioSend(uint32 ssrc, bool mute,
+ const AudioOptions* options,
+ AudioRenderer* renderer) {
+ if (!SetLocalRenderer(ssrc, renderer)) {
+ return false;
+ }
+ if (!MuteStream(ssrc, mute)) {
+ return false;
pthatcher1 2015/09/09 14:25:14 Should we rollback the renderer if MuteStream fail
the sun 2015/09/09 14:52:11 See discussion in WebRtcVideoEngine2.cc.
+ }
+ if (!mute && options) {
+ return SetOptions(*options);
pthatcher1 2015/09/09 14:25:14 Should we rollback the mute state and renderer if
the sun 2015/09/09 14:52:11 See discussion in WebRtcVideoEngine2.cc.
+ } else {
pthatcher1 2015/09/09 14:25:14 Same here as before: could remove the "else".
the sun 2015/09/09 14:52:11 Done.
+ return true;
+ }
+}
+
// TODO(ronghuawu): Change this method to return bool.
void WebRtcVoiceMediaChannel::ConfigureSendChannel(int channel) {
if (engine()->voe()->network()->RegisterExternalTransport(

Powered by Google App Engine
This is Rietveld 408576698