Minor cleanup in IncomingVideoStream.

webrtc/common_video/incoming_video_stream.cc

 /*
  *  Copyright (c) 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.
  */
 
 #include "webrtc/common_video/include/incoming_video_stream.h"
 
 #include <assert.h>
 
-#if defined(_WIN32)
-#include <windows.h>
-#elif defined(WEBRTC_LINUX)
-#include <sys/time.h>
-#include <time.h>
-#else
-#include <sys/time.h>
-#endif
-
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/base/timeutils.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/common_video/video_render_frames.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
-#include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 
 IncomingVideoStream::IncomingVideoStream(bool disable_prerenderer_smoothing)
     : disable_prerenderer_smoothing_(disable_prerenderer_smoothing),
       incoming_render_thread_(),
       deliver_buffer_event_(EventTimerWrapper::Create()),
       running_(false),
       external_callback_(nullptr),
-      render_callback_(nullptr),
       render_buffers_(new VideoRenderFrames()),
       incoming_rate_(0),
       last_rate_calculation_time_ms_(0),
       num_frames_since_last_calculation_(0) {}
 
 IncomingVideoStream::~IncomingVideoStream() {
   Stop();
 }
 
 void IncomingVideoStream::OnFrame(const VideoFrame& video_frame) {
@@ skipping 18 matching lines @@
   if (disable_prerenderer_smoothing_) {
     DeliverFrame(video_frame);
   } else {
     rtc::CritScope csB(&buffer_critsect_);
     if (render_buffers_->AddFrame(video_frame) == 1) {
       deliver_buffer_event_->Set();
     }
   }
 }
 
-void IncomingVideoStream::SetRenderCallback(
-    rtc::VideoSinkInterface<VideoFrame>* render_callback) {
-  rtc::CritScope cs(&thread_critsect_);
-  render_callback_ = render_callback;
-}
-
 int32_t IncomingVideoStream::SetExpectedRenderDelay(
     int32_t delay_ms) {
   rtc::CritScope csS(&stream_critsect_);
   if (running_) {
     return -1;
   }
   rtc::CritScope cs(&buffer_critsect_);
   return render_buffers_->SetRenderDelay(delay_ms);
 }
 
@@ skipping 102 matching lines @@
 void IncomingVideoStream::DeliverFrame(const VideoFrame& video_frame) {
   rtc::CritScope cs(&thread_critsect_);
   if (video_frame.IsZeroSize()) {
     // No frame.
     return;
   }
 
   // Send frame for rendering.
   if (external_callback_) {
     external_callback_->OnFrame(video_frame);
-  } else if (render_callback_) {
-    render_callback_->OnFrame(video_frame);
   }
 }
 
 }  // namespace webrtc