Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface.

webrtc/api/test/fakevideotrackrenderer.h

Index: webrtc/api/test/fakevideotrackrenderer.h
diff --git a/webrtc/api/test/fakevideotrackrenderer.h b/webrtc/api/test/fakevideotrackrenderer.h
index 816b44744fc2acc35e6d9e62119fab5702331552..e8ef649b1f95c5b89da932d1ee43bea57d637365 100644
--- a/webrtc/api/test/fakevideotrackrenderer.h
+++ b/webrtc/api/test/fakevideotrackrenderer.h
@@ -16,15 +16,46 @@
 
 namespace webrtc {
 
-class FakeVideoTrackRenderer : public VideoRendererInterface {
+class FakeVideoTrackRenderer
+    : public rtc::VideoSinkInterface<cricket::VideoFrame> {
  public:
   FakeVideoTrackRenderer(VideoTrackInterface* video_track)
       : video_track_(video_track), last_frame_(NULL) {
-    video_track_->AddRenderer(this);
+    video_track_->AddOrUpdateSink(this, rtc::VideoSinkWants());
+  }
+  ~FakeVideoTrackRenderer() { video_track_->RemoveSink(this); }
+
+  virtual void OnFrame(const cricket::VideoFrame& video_frame) override {
+    last_frame_ = const_cast<cricket::VideoFrame*>(&video_frame);

[pthatcher1, 2016/02/25 07:07:30]

Why do we need a const_cast?  Why not just make the type of last_frame_ be
const?  If it's for comparison only, shouldn't a const value still work?

[nisse-webrtc, 2016/02/25 11:42:28]

I can change last_frame_ to a const pointer in both classes. No idea why it
wasn't const earlier.

No, it's even better, I can delete it! It was introduced for the test case
VideoTrackTest.RenderVideoWithPendingRotation (commit 00c509ad by guoweis a year
ago), which was removed by magjed in  c2db810b8958588771 half a year later.

+    fake_renderer_.RenderFrame(&video_frame);
   }
-  ~FakeVideoTrackRenderer() {
-    video_track_->RemoveRenderer(this);
+
+  int errors() const { return fake_renderer_.errors(); }
+  int width() const { return fake_renderer_.width(); }
+  int height() const { return fake_renderer_.height(); }
+  bool black_frame() const { return fake_renderer_.black_frame(); }
+
+  int num_rendered_frames() const {
+    return fake_renderer_.num_rendered_frames();
+  }
+  const cricket::VideoFrame* last_frame() const { return last_frame_; }
+
+ private:
+  cricket::FakeVideoRenderer fake_renderer_;
+  rtc::scoped_refptr<VideoTrackInterface> video_track_;
+
+  // Weak reference for frame pointer comparison only.
+  cricket::VideoFrame* last_frame_;
+};
+
+// Similar class, using the deprecated AddRenderer/RemoveRenderer methods.
+class FakeVideoTrackRendererOld : public VideoRendererInterface {

[pthatcher1, 2016/02/25 07:07:30]

When are we going to remove this?  It could use a TODO explaining when.

[nisse-webrtc, 2016/02/25 11:42:28]

The test should clearly be deleted together with the feature.

+ public:
+  FakeVideoTrackRendererOld(VideoTrackInterface* video_track)
+      : video_track_(video_track), last_frame_(NULL) {
+    video_track_->AddRenderer(this);
   }
+  ~FakeVideoTrackRendererOld() { video_track_->RemoveRenderer(this); }
 
   virtual void RenderFrame(const cricket::VideoFrame* video_frame) override {
     last_frame_ = const_cast<cricket::VideoFrame*>(video_frame);