Added mute logic to VideoTrackRenderers.

talk/app/webrtc/videotrackrenderers.cc

Index: talk/app/webrtc/videotrackrenderers.cc
diff --git a/talk/app/webrtc/videotrackrenderers.cc b/talk/app/webrtc/videotrackrenderers.cc
index 3f9301b7185d88789877c39f985ae150e4e8158f..33c5e5bb39d10a2b86e3b68712935209eae5d811 100644
--- a/talk/app/webrtc/videotrackrenderers.cc
+++ b/talk/app/webrtc/videotrackrenderers.cc
@@ -26,7 +26,7 @@
  */
 
 #include "talk/app/webrtc/videotrackrenderers.h"
-#include "talk/media/base/videoframe.h"
+#include "talk/media/webrtc/webrtcvideoframe.h"
 
 namespace webrtc {
 
@@ -56,13 +56,25 @@ void VideoTrackRenderers::SetEnabled(bool enable) {
 
 bool VideoTrackRenderers::RenderFrame(const cricket::VideoFrame* frame) {
   rtc::CritScope cs(&critical_section_);
-  if (!enabled_) {
-    return true;
+  if (enabled_)
+    RenderFrameToRenderers(frame);
+  else {
+    cricket::WebRtcVideoFrame black(new rtc::RefCountedObject<I420Buffer>(
+                                        frame->GetWidth(), frame->GetHeight()),
+                                    frame->GetTimeStamp(),
+                                    frame->GetVideoRotation());

[pthatcher1, 2016/01/13 17:13:38]

Why does frame generation have to happen in the critical_section_?  Wouldn't it
make more sense to do it outside?

[nisse-webrtc, 2016/01/14 08:00:27]

Not sure, but I think it's desirable to have it consistent with the enabled
state. I.e., rule out the sequence

0. Start with enabled_ == false
1. Enter SetEnabled(true)
2. Enter RenderFrame. Still enabled_ == false, so start generating a black
frame.
3. The SetEnabled call sets enabled_ = true, and returns.
4. RenderFrame passes on the black frame to the renderers, even though the track
is supposedly enabled now.
 
But I see it's desirable to do the frame generation outside of the critical
section. It just needs a little more logic (after the frame is ready, enter the
critical section again, and recheck enabled_) to ensure consistency.

+    black.SetToBlack();
+    RenderFrameToRenderers(&black);
   }
+  return true;
+}
+
+// Called with critical_section_ already locked
+void VideoTrackRenderers::RenderFrameToRenderers(
+    const cricket::VideoFrame* frame) {
   for (VideoRendererInterface* renderer : renderers_) {
     renderer->RenderFrame(frame);
   }
-  return true;
 }
 
 }  // namespace webrtc