Make VideoTrack and VideoTrackRenderers implement rtc::VideoSourceInterface.

webrtc/api/test/fakevideotrackrenderer.h

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_API_TEST_FAKEVIDEOTRACKRENDERER_H_
 #define WEBRTC_API_TEST_FAKEVIDEOTRACKRENDERER_H_
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/media/base/fakevideorenderer.h"
 
 namespace webrtc {
 
-class FakeVideoTrackRenderer : public VideoRendererInterface {
+class FakeVideoTrackRenderer
+    : public rtc::VideoSinkInterface<cricket::VideoFrame> {

[perkj_webrtc, 2016/02/12 14:40:14]

Se should continue testing both until all clients has been updated. ie -
android, chrome etc.

[nisse-webrtc, 2016/02/15 08:54:48]

Unclear what you suggest...

I think it should be possible to leave this class unchanged, until the backwards
compatibility methods AddSink/RemoveSink are deleted (VideoRendererInterface
inherits VideoSinkInterface). Would that help clients?

[perkj_webrtc, 2016/02/15 12:36:27]

Sorry- I meant that currently clients such as chrome uses AddRenderer -
RemoveRenderer - therefor- as long as those methods has not been removed, we
should keep the old tests that tests AddRenderer and RemoveRenderer.
If we add new methods, AddSink and RemoveSink, there should be tests for them
too.

[nisse-webrtc, 2016/02/15 14:51:53]

Made two variants of the VideoTrack.RenderVideo test case and the
FakeVideoTrackRenderer class.

  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_->RemoveRenderer(this);
+    video_track_->RemoveSink(this);
   }
 
-  virtual void RenderFrame(const cricket::VideoFrame* video_frame) override {
-    last_frame_ = const_cast<cricket::VideoFrame*>(video_frame);
-    fake_renderer_.RenderFrame(video_frame);
+  virtual void OnFrame(const cricket::VideoFrame& video_frame) override {
+    last_frame_ = const_cast<cricket::VideoFrame*>(&video_frame);
+    fake_renderer_.RenderFrame(&video_frame);
   }
 
   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_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_TEST_FAKEVIDEOTRACKRENDERER_H_