- Rename VoiceChannel::MuteStream() -> SetAudioSend() (incl. media channel)

talk/media/webrtc/webrtcvoiceengine.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 2356 matching lines @@
     DCHECK(send == SEND_NOTHING);
     if (engine()->voe()->base()->StopSend(channel) == -1) {
       LOG_RTCERR1(StopSend, channel);
       return false;
     }
   }
 
   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 fails?

[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 SetOptions fails?

[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(
           channel, *this) == -1) {
     LOG_RTCERR2(RegisterExternalTransport, channel, this);
   }
 
   // Enable RTCP (for quality stats and feedback messages)
   EnableRtcp(channel);
 
@@ skipping 1235 matching lines @@
 
 int WebRtcSoundclipStream::Rewind() {
   mem_.Rewind();
   // Return -1 to keep VoiceEngine from looping.
   return (loop_) ? 0 : -1;
 }
 
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE