commit 8f597628973fbc90da3041ac64a54d75ef5fb9c5
author Niels Möller <nisse@webrtc.org> Wed Mar 23 10:33:07 2016 +0100
committer Niels Möller <nisse@webrtc.org> Wed Mar 23 09:33:19 2016 +0000
tree 6726451d6438cb6d5e220943d247299c63c2ffa1
parent c8f952deaae5eccadf218bb0300ee49b50a87ce8

Delete VideoRendererInterface.

Use in chromium was deleted a few days ago.

BUG=webrtc:5426
R=magjed@webrtc.org, pbos@webrtc.org, perkj@webrtc.org, pthatcher@webrtc.org, tkchin@webrtc.org

Review URL: https://codereview.webrtc.org/1817473002 .

Cr-Commit-Position: refs/heads/master@{#12099}

webrtc/examples/peerconnection/client/linux/main_wnd.h

diff --git a/webrtc/examples/peerconnection/client/linux/main_wnd.h b/webrtc/examples/peerconnection/client/linux/main_wnd.h
index a7eb25e..e756fc9 100644
--- a/webrtc/examples/peerconnection/client/linux/main_wnd.h
+++ b/webrtc/examples/peerconnection/client/linux/main_wnd.h
@@ -77,9 +77,8 @@
                   webrtc::VideoTrackInterface* track_to_render);
     virtual ~VideoRenderer();
 
-    // VideoRendererInterface implementation
-    virtual void SetSize(int width, int height);
-    virtual void OnFrame(const cricket::VideoFrame& frame);
+    // VideoSinkInterface implementation
+    void OnFrame(const cricket::VideoFrame& frame) override;
 
     const uint8_t* image() const { return image_.get(); }
 
@@ -92,6 +91,7 @@
     }
 
    protected:
+    void SetSize(int width, int height);
     rtc::scoped_ptr<uint8_t[]> image_;
     int width_;
     int height_;

webrtc/examples/peerconnection/client/main_wnd.cc

diff --git a/webrtc/examples/peerconnection/client/main_wnd.cc b/webrtc/examples/peerconnection/client/main_wnd.cc
index 72f85b9..608e6df 100644
--- a/webrtc/examples/peerconnection/client/main_wnd.cc
+++ b/webrtc/examples/peerconnection/client/main_wnd.cc
@@ -576,11 +576,11 @@
   bmi_.bmiHeader.biHeight = -height;
   bmi_.bmiHeader.biSizeImage = width * height *
                               (bmi_.bmiHeader.biBitCount >> 3);
-  rendered_track_->AddRenderer(this);
+  rendered_track_->AddOrUpdateSink(this, rtc::VideoSinkWants());
 }
 
 MainWnd::VideoRenderer::~VideoRenderer() {
-  rendered_track_->RemoveRenderer(this);
+  rendered_track_->RemoveSink(this);
   ::DeleteCriticalSection(&buffer_lock_);
 }
 
@@ -598,16 +598,14 @@
   image_.reset(new uint8_t[bmi_.bmiHeader.biSizeImage]);
 }
 
-void MainWnd::VideoRenderer::RenderFrame(
-    const cricket::VideoFrame* video_frame) {
-  if (!video_frame)
-    return;
+void MainWnd::VideoRenderer::OnFrame(
+    const cricket::VideoFrame& video_frame) {
 
   {
     AutoLock<VideoRenderer> lock(this);
 
     const cricket::VideoFrame* frame =
-        video_frame->GetCopyWithRotationApplied();
+        video_frame.GetCopyWithRotationApplied();
 
     SetSize(static_cast<int>(frame->GetWidth()),
             static_cast<int>(frame->GetHeight()));

webrtc/examples/peerconnection/client/main_wnd.h

diff --git a/webrtc/examples/peerconnection/client/main_wnd.h b/webrtc/examples/peerconnection/client/main_wnd.h
index 5cf38df..0e7f796 100644
--- a/webrtc/examples/peerconnection/client/main_wnd.h
+++ b/webrtc/examples/peerconnection/client/main_wnd.h
@@ -102,7 +102,7 @@
 
   HWND handle() const { return wnd_; }
 
-  class VideoRenderer : public webrtc::VideoRendererInterface {
+  class VideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> {
    public:
     VideoRenderer(HWND wnd, int width, int height,
                   webrtc::VideoTrackInterface* track_to_render);
@@ -116,14 +116,15 @@
       ::LeaveCriticalSection(&buffer_lock_);
     }
 
-    // VideoRendererInterface implementation
-    virtual void SetSize(int width, int height);
-    virtual void RenderFrame(const cricket::VideoFrame* frame);
+    // VideoSinkInterface implementation
+    void OnFrame(const cricket::VideoFrame& frame) override;
 
     const BITMAPINFO& bmi() const { return bmi_; }
     const uint8_t* image() const { return image_.get(); }
 
    protected:
+    void SetSize(int width, int height);
+
     enum {
       SET_SIZE,
       RENDER_FRAME,