Delete cricket::VideoRenderer.

webrtc/media/devices/gdivideorenderer.cc

 /*
  *  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.
  */
 
@@ skipping 12 matching lines @@
 
 /////////////////////////////////////////////////////////////////////////////
 // Definition of private class VideoWindow. We use a worker thread to manage
 // the window.
 /////////////////////////////////////////////////////////////////////////////
 class GdiVideoRenderer::VideoWindow : public rtc::Win32Window {
  public:
   VideoWindow(int x, int y, int width, int height);
   virtual ~VideoWindow();
 
+  // Called when a new frame is available. Upon this call, we send
+  // kRenderFrameMsg to the window thread. Context: non-worker thread. It may be
+  // better to pass RGB bytes to VideoWindow. However, we pass VideoFrame to put
+  // all the thread synchronization within VideoWindow.
+  void OnFrame(const VideoFrame& frame);
+
+ protected:
+  // Override virtual method of rtc::Win32Window. Context: worker Thread.
+  bool OnMessage(UINT uMsg,
+                 WPARAM wParam,
+                 LPARAM lParam,
+                 LRESULT& result) override;
+
+ private:
+  enum { kSetSizeMsg = WM_USER, kRenderFrameMsg};
+
   // Called when the video size changes. If it is called the first time, we
   // create and start the thread. Otherwise, we send kSetSizeMsg to the thread.
   // Context: non-worker thread.
   bool SetSize(int width, int height);
 
-  // Called when a new frame is available. Upon this call, we send
-  // kRenderFrameMsg to the window thread. Context: non-worker thread. It may be
-  // better to pass RGB bytes to VideoWindow. However, we pass VideoFrame to put
-  // all the thread synchronization within VideoWindow.
-  bool RenderFrame(const VideoFrame* frame);
-
- protected:
-  // Override virtual method of rtc::Win32Window. Context: worker Thread.
-  virtual bool OnMessage(UINT uMsg, WPARAM wParam, LPARAM lParam,
-                         LRESULT& result);
-
- private:
-  enum { kSetSizeMsg = WM_USER, kRenderFrameMsg};
-
   class WindowThread : public rtc::Thread {
    public:
     explicit WindowThread(VideoWindow* window) : window_(window) {}
 
     virtual ~WindowThread() {
       Stop();
     }
 
     // Override virtual method of rtc::Thread. Context: worker Thread.
     virtual void Run() {
@@ skipping 59 matching lines @@
     // Create and start the window thread.
     window_thread_.reset(new WindowThread(this));
     return window_thread_->Start();
   } else if (width != bmi_.bmiHeader.biWidth ||
       height != -bmi_.bmiHeader.biHeight) {
     SendMessage(handle(), kSetSizeMsg, 0, MAKELPARAM(width, height));
   }
   return true;
 }
 
-bool GdiVideoRenderer::VideoWindow::RenderFrame(const VideoFrame* video_frame) {
+void GdiVideoRenderer::VideoWindow::OnFrame(const VideoFrame& video_frame) {
   if (!handle()) {
-    return false;
+    return;
   }
 
-  const VideoFrame* frame = video_frame->GetCopyWithRotationApplied();
+  const VideoFrame* frame = video_frame.GetCopyWithRotationApplied();
 
-  if (!SetSize(static_cast<int>(frame->GetWidth()),
-               static_cast<int>(frame->GetHeight()))) {
-    return false;
+  if (SetSize(static_cast<int>(frame->GetWidth()),
+              static_cast<int>(frame->GetHeight()))) {
+    SendMessage(handle(), kRenderFrameMsg, reinterpret_cast<WPARAM>(frame), 0);
   }
-
-  SendMessage(handle(), kRenderFrameMsg, reinterpret_cast<WPARAM>(frame), 0);
-  return true;
 }
 
 bool GdiVideoRenderer::VideoWindow::OnMessage(UINT uMsg, WPARAM wParam,
                                               LPARAM lParam, LRESULT& result) {
   switch (uMsg) {
     case WM_PAINT:
       OnPaint();
       return true;
 
     case WM_DESTROY:
@@ skipping 81 matching lines @@
 
 /////////////////////////////////////////////////////////////////////////////
 // Implementation of class GdiVideoRenderer
 /////////////////////////////////////////////////////////////////////////////
 GdiVideoRenderer::GdiVideoRenderer(int x, int y)
     : initial_x_(x),
       initial_y_(y) {
 }
 GdiVideoRenderer::~GdiVideoRenderer() {}
 
-bool GdiVideoRenderer::SetSize(int width, int height, int reserved) {
-  if (!window_.get()) {  // Create the window for the first frame
-    window_.reset(new VideoWindow(initial_x_, initial_y_, width, height));
+void GdiVideoRenderer::OnFrame(const VideoFrame& frame) {
+  if (!window_.get()) { // Create the window for the first frame
+    window_.reset(new VideoWindow(initial_x_, initial_y_,
+                                  static_cast<int>(frame.GetWidth()),
+                                  static_cast<int>(frame.GetHeight())));
   }
-  return window_->SetSize(width, height);
-}
-
-bool GdiVideoRenderer::RenderFrame(const VideoFrame* frame) {
-  if (!frame || !window_.get()) {
-    return false;
-  }
-  return window_->RenderFrame(frame);
+  window_->OnFrame(frame);
 }
 
 }  // namespace cricket
 #endif  // WIN32