commit 1509fa1aa9cfb3be98b833ecf00ef466345dc05e
author nisse <nisse@webrtc.org> Wed Mar 23 11:05:57 2016
committer Commit bot <commit-bot@chromium.org> Wed Mar 23 11:06:05 2016
tree 9fabeaa4afae80ff8c47d32c3780eb806ae478dc
parent de3185521b5e31bae14c6c4c523965a2a60e04eb

Delete cricket::VideoRenderer.

TBR=glaznev@webrtc.org (deleting an #include in main_wnd.h)
BUG=webrtc:5426

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

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

webrtc/media/base/fakevideorenderer.h

diff --git a/webrtc/media/base/fakevideorenderer.h b/webrtc/media/base/fakevideorenderer.h
index 5cc1a59..00fbc40 100644
--- a/webrtc/media/base/fakevideorenderer.h
+++ b/webrtc/media/base/fakevideorenderer.h
@@ -14,12 +14,12 @@
 #include "webrtc/base/logging.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/media/base/videoframe.h"
-#include "webrtc/media/base/videorenderer.h"
+#include "webrtc/media/base/videosinkinterface.h"
 
 namespace cricket {
 
 // Faked video renderer that has a callback for actions on rendering.
-class FakeVideoRenderer : public VideoRenderer {
+class FakeVideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> {
  public:
   FakeVideoRenderer()
       : errors_(0),
@@ -30,24 +30,18 @@
         num_rendered_frames_(0),
         black_frame_(false) {}
 
-  virtual bool RenderFrame(const VideoFrame* frame) {
+  virtual void OnFrame(const VideoFrame& frame) {
     rtc::CritScope cs(&crit_);
     // TODO(zhurunz) Check with VP8 team to see if we can remove this
     // tolerance on Y values.
-    black_frame_ = CheckFrameColorYuv(6, 48, 128, 128, 128, 128, frame);
+    black_frame_ = CheckFrameColorYuv(6, 48, 128, 128, 128, 128, &frame);
     // Treat unexpected frame size as error.
-    if (!frame) {
-      LOG(LS_WARNING) << "RenderFrame expected non-null frame.";
-      ++errors_;
-      return false;
-    }
     ++num_rendered_frames_;
-    width_ = static_cast<int>(frame->GetWidth());
-    height_ = static_cast<int>(frame->GetHeight());
-    rotation_ = frame->GetVideoRotation();
-    timestamp_ = frame->GetTimeStamp();
-    SignalRenderFrame(frame);
-    return true;
+    width_ = static_cast<int>(frame.GetWidth());
+    height_ = static_cast<int>(frame.GetHeight());
+    rotation_ = frame.GetVideoRotation();
+    timestamp_ = frame.GetTimeStamp();
+    SignalRenderFrame(&frame);
   }
 
   int errors() const { return errors_; }

webrtc/media/base/videorenderer.h

diff --git a/webrtc/media/base/videorenderer.h b/webrtc/media/base/videorenderer.h
deleted file mode 100644
index 5e32873..0000000
--- a/webrtc/media/base/videorenderer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (c) 2004 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_MEDIA_BASE_VIDEORENDERER_H_
-#define WEBRTC_MEDIA_BASE_VIDEORENDERER_H_
-
-#include "webrtc/media/base/videosinkinterface.h"
-
-namespace cricket {
-
-class VideoFrame;
-
-// Abstract interface for rendering VideoFrames.
-class VideoRenderer : public rtc::VideoSinkInterface<VideoFrame> {
- public:
-  virtual ~VideoRenderer() {}
-  // Called when a new frame is available for display.
-  virtual bool RenderFrame(const VideoFrame *frame) = 0;
-  // Intended to replace RenderFrame.
-  void OnFrame(const cricket::VideoFrame& frame) override {
-    // Unused return value
-    RenderFrame(&frame);
-  }
-};
-
-}  // namespace cricket
-
-#endif  // WEBRTC_MEDIA_BASE_VIDEORENDERER_H_