Revert of Split IncomingVideoStream into two implementations, with smoothing and without.

webrtc/common_video/video_render_frames.h

Index: webrtc/common_video/video_render_frames.h
diff --git a/webrtc/common_video/video_render_frames.h b/webrtc/common_video/video_render_frames.h
index 26a7ef5137438ac336a1cbe319668558e3d7c624..acd955887f81405cd220e997348c92d0d58f9c90 100644
--- a/webrtc/common_video/video_render_frames.h
+++ b/webrtc/common_video/video_render_frames.h
@@ -23,8 +23,7 @@
 // Class definitions
 class VideoRenderFrames {
  public:
-  explicit VideoRenderFrames(uint32_t render_delay_ms);
-  VideoRenderFrames(const VideoRenderFrames&) = delete;
+  VideoRenderFrames();
 
   // Add a frame to the render queue
   int32_t AddFrame(const VideoFrame& new_frame);
@@ -32,8 +31,14 @@
   // Get a frame for rendering, or false if it's not time to render.
   rtc::Optional<VideoFrame> FrameToRender();
 
+  // Releases all frames
+  int32_t ReleaseAllFrames();
+
   // Returns the number of ms to next frame to render
   uint32_t TimeToNextFrameRelease();
+
+  // Sets estimates delay in renderer
+  int32_t SetRenderDelay(const uint32_t render_delay);
 
  private:
   // 10 seconds for 30 fps.
@@ -47,7 +52,7 @@
   std::list<VideoFrame> incoming_frames_;
 
   // Estimated delay from a frame is released until it's rendered.
-  const uint32_t render_delay_ms_;
+  uint32_t render_delay_ms_;
 };
 
 }  // namespace webrtc