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

talk/media/webrtc/webrtcvideoengine2.cc

Index: talk/media/webrtc/webrtcvideoengine2.cc
diff --git a/talk/media/webrtc/webrtcvideoengine2.cc b/talk/media/webrtc/webrtcvideoengine2.cc
index 7d4181740e2cf1916a747d9e2fefd3a2fd499a5a..a05498ed9233ab64e96d6b97a033eb2d776d9b3c 100644
--- a/talk/media/webrtc/webrtcvideoengine2.cc
+++ b/talk/media/webrtc/webrtcvideoengine2.cc
@@ -1094,6 +1094,18 @@ bool WebRtcVideoChannel2::SetSend(bool send) {
   return true;
 }
 
+bool WebRtcVideoChannel2::SetVideoSend(uint32 ssrc, bool mute,
+                                       const VideoOptions* options) {
+  if (!MuteStream(ssrc, mute)) {
+    return false;
+  }
+  if (!mute && options) {
+    return SetOptions(*options);

[pthatcher1, 2015/09/09 14:25:14]

Should we rollback the mute state if SetOptions fails?

[the sun, 2015/09/09 14:52:11]

I decided against that (same goes for WebRtcVoiceMediaChannel) in this CL
because:

1. The purpose of the CL is primarily to change the API.
2. That would be changing the semantics. I'm not sure we don't actually rely on
the state not being rolled back. (How is that for a negation tongue-twister?:)

I've added TODOs: about making the state mutation atomic.

+  } else {
+    return true;
+  }
+}
+
 bool WebRtcVideoChannel2::ValidateSendSsrcAvailability(
     const StreamParams& sp) const {
   for (uint32_t ssrc: sp.ssrcs) {