Make WebRtcVideoChannel2::WebRtcVideoSendStream implement rtc::VideoRendererInterface.

talk/app/webrtc/videotrackrenderers.cc

 /*
  * libjingle
  * Copyright 2012 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 18 matching lines @@
 #include "talk/media/webrtc/webrtcvideoframe.h"
 
 namespace webrtc {
 
 VideoTrackRenderers::VideoTrackRenderers() : enabled_(true) {
 }
 
 VideoTrackRenderers::~VideoTrackRenderers() {
 }
 
-void VideoTrackRenderers::AddRenderer(VideoRendererInterface* renderer) {
-  if (!renderer) {
+void VideoTrackRenderers::AddSink(
+    rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
+  if (!sink) {
     return;
   }
   rtc::CritScope cs(&critical_section_);
-  renderers_.insert(renderer);
+  sinks_.insert(sink);
 }
 
-void VideoTrackRenderers::RemoveRenderer(VideoRendererInterface* renderer) {
+void VideoTrackRenderers::RemoveSink(
+    rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
   rtc::CritScope cs(&critical_section_);
-  renderers_.erase(renderer);
+  sinks_.erase(sink);
 }
 
 void VideoTrackRenderers::SetEnabled(bool enable) {
   rtc::CritScope cs(&critical_section_);
   enabled_ = enable;
 }
 
 bool VideoTrackRenderers::RenderFrame(const cricket::VideoFrame* frame) {
   {
     rtc::CritScope cs(&critical_section_);
     if (enabled_) {
-      RenderFrameToRenderers(frame);
+      SendFrameToSinks(*frame);
       return true;
     }
   }
 
   // Generate the black frame outside of the critical section. Note
   // that this may result in unexpected frame order, in the unlikely
   // case that RenderFrame is called from multiple threads without
   // proper serialization, and the track is switched from disabled to
   // enabled in the middle of the first call.
   cricket::WebRtcVideoFrame black(new rtc::RefCountedObject<I420Buffer>(
                                       static_cast<int>(frame->GetWidth()),
                                       static_cast<int>(frame->GetHeight())),
                                   frame->GetTimeStamp(),
                                   frame->GetVideoRotation());
   black.SetToBlack();
 
   {
     rtc::CritScope cs(&critical_section_);
     // Check enabled_ flag again, since the track might have been
     // enabled while we generated the black frame. I think the
     // enabled-ness ought to be applied at the track output, and hence
     // an enabled track shouldn't send any blacked out frames.
-    RenderFrameToRenderers(enabled_ ? frame : &black);
+    SendFrameToSinks(enabled_ ? *frame : black);
 
     return true;
   }
 }
 
 // Called with critical_section_ already locked
-void VideoTrackRenderers::RenderFrameToRenderers(
-    const cricket::VideoFrame* frame) {
-  for (VideoRendererInterface* renderer : renderers_) {
-    renderer->RenderFrame(frame);
+void VideoTrackRenderers::SendFrameToSinks(const cricket::VideoFrame& frame) {
+  for (auto* sink : sinks_) {
+    sink->OnFrame(frame);
   }
 }
 
 }  // namespace webrtc