Deletes the class VideoRendererCallback.

webrtc/common_video/incoming_video_stream.cc

Index: webrtc/common_video/incoming_video_stream.cc
diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc
index b0f105c76bb5ec2d5f183bc0295d3906b1e7c70d..181dae3c15c34b10fac90cd47ffc896c1d47e592 100644
--- a/webrtc/common_video/incoming_video_stream.cc
+++ b/webrtc/common_video/incoming_video_stream.cc
@@ -32,10 +32,8 @@
 
 namespace webrtc {
 
-IncomingVideoStream::IncomingVideoStream(uint32_t stream_id,
-                                         bool disable_prerenderer_smoothing)
-    : stream_id_(stream_id),
-      disable_prerenderer_smoothing_(disable_prerenderer_smoothing),
+IncomingVideoStream::IncomingVideoStream(bool disable_prerenderer_smoothing)
+    : disable_prerenderer_smoothing_(disable_prerenderer_smoothing),
       incoming_render_thread_(),
       deliver_buffer_event_(EventTimerWrapper::Create()),
       running_(false),
@@ -55,16 +53,15 @@ IncomingVideoStream::~IncomingVideoStream() {
   Stop();
 }
 
-VideoRenderCallback* IncomingVideoStream::ModuleCallback() {
+rtc::VideoSinkInterface<VideoFrame>* IncomingVideoStream::ModuleCallback() {
   return this;
 }
 
-int32_t IncomingVideoStream::RenderFrame(const uint32_t stream_id,
-                                         const VideoFrame& video_frame) {
+void IncomingVideoStream::OnFrame(const VideoFrame& video_frame) {
   rtc::CritScope csS(&stream_critsect_);
 
   if (!running_) {
-    return -1;
+    return;
   }
 
   // Rate statistics.
@@ -87,7 +84,6 @@ int32_t IncomingVideoStream::RenderFrame(const uint32_t stream_id,
       deliver_buffer_event_->Set();
     }
   }
-  return 0;
 }
 
 void IncomingVideoStream::SetStartImage(const VideoFrame& video_frame) {
@@ -103,7 +99,7 @@ void IncomingVideoStream::SetTimeoutImage(const VideoFrame& video_frame,
 }
 
 void IncomingVideoStream::SetRenderCallback(
-    VideoRenderCallback* render_callback) {
+    rtc::VideoSinkInterface<VideoFrame>* render_callback) {
   rtc::CritScope cs(&thread_critsect_);
   render_callback_ = render_callback;
 }
@@ -119,7 +115,7 @@ int32_t IncomingVideoStream::SetExpectedRenderDelay(
 }
 
 void IncomingVideoStream::SetExternalCallback(
-    VideoRenderCallback* external_callback) {
+    rtc::VideoSinkInterface<VideoFrame>* external_callback) {
   rtc::CritScope cs(&thread_critsect_);
   external_callback_ = external_callback;
 }
@@ -183,10 +179,6 @@ int32_t IncomingVideoStream::Reset() {
   return 0;
 }
 
-uint32_t IncomingVideoStream::StreamId() const {
-  return stream_id_;
-}
-
 uint32_t IncomingVideoStream::IncomingRate() const {
   rtc::CritScope cs(&stream_critsect_);
   return incoming_rate_;
@@ -231,13 +223,13 @@ void IncomingVideoStream::DeliverFrame(const VideoFrame& video_frame) {
       if (last_render_time_ms_ == 0 && !start_image_.IsZeroSize()) {
         // We have not rendered anything and have a start image.
         temp_frame_.CopyFrame(start_image_);
-        render_callback_->RenderFrame(stream_id_, temp_frame_);
+        render_callback_->OnFrame(temp_frame_);
       } else if (!timeout_image_.IsZeroSize() &&
                  last_render_time_ms_ + timeout_time_ <
                      TickTime::MillisecondTimestamp()) {
         // Render a timeout image.
         temp_frame_.CopyFrame(timeout_image_);
-        render_callback_->RenderFrame(stream_id_, temp_frame_);
+        render_callback_->OnFrame(temp_frame_);
       }
     }
 
@@ -247,9 +239,9 @@ void IncomingVideoStream::DeliverFrame(const VideoFrame& video_frame) {
 
   // Send frame for rendering.
   if (external_callback_) {
-    external_callback_->RenderFrame(stream_id_, video_frame);
+    external_callback_->OnFrame(video_frame);
   } else if (render_callback_) {
-    render_callback_->RenderFrame(stream_id_, video_frame);
+    render_callback_->OnFrame(video_frame);
   }
 
   // We're done with this frame.