Remove frame time scheduing in IncomingVideoStream

webrtc/common_video/video_render_frames.cc

Index: webrtc/common_video/video_render_frames.cc
diff --git a/webrtc/common_video/video_render_frames.cc b/webrtc/common_video/video_render_frames.cc
deleted file mode 100644
index a7db15c7eaecd1b59fe3a1d104d7191c88819a72..0000000000000000000000000000000000000000
--- a/webrtc/common_video/video_render_frames.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- *  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/video_render_frames.h"
-
-#include <assert.h>
-
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/system_wrappers/include/tick_util.h"
-#include "webrtc/system_wrappers/include/trace.h"
-
-namespace webrtc {
-
-const uint32_t KEventMaxWaitTimeMs = 200;
-const uint32_t kMinRenderDelayMs = 10;

[pbos-webrtc, 2015/11/10 18:41:57]

Would just removing this min value fix your problem?

[qiangchen, 2015/11/13 20:23:01]

I do not think so.

IncomingVideoStream will release a frame at Target_Render_Time - RenderDelay. 
So if we decrease the RenderDelay, IncomingVideoStream will hold a frame for
longer.

Anyway, we need to figure out a way specific to Chrome.

-const uint32_t kMaxRenderDelayMs= 500;
-
-VideoRenderFrames::VideoRenderFrames()
-    : render_delay_ms_(10) {
-}
-
-int32_t VideoRenderFrames::AddFrame(const VideoFrame& new_frame) {
-  const int64_t time_now = TickTime::MillisecondTimestamp();
-
-  // Drop old frames only when there are other frames in the queue, otherwise, a
-  // really slow system never renders any frames.
-  if (!incoming_frames_.empty() &&
-      new_frame.render_time_ms() + KOldRenderTimestampMS < time_now) {
-    WEBRTC_TRACE(kTraceWarning,
-                 kTraceVideoRenderer,
-                 -1,
-                 "%s: too old frame, timestamp=%u.",
-                 __FUNCTION__,
-                 new_frame.timestamp());
-    return -1;
-  }
-
-  if (new_frame.render_time_ms() > time_now + KFutureRenderTimestampMS) {
-    WEBRTC_TRACE(kTraceWarning, kTraceVideoRenderer, -1,
-                 "%s: frame too long into the future, timestamp=%u.",
-                 __FUNCTION__, new_frame.timestamp());
-    return -1;
-  }
-
-  incoming_frames_.push_back(new_frame);
-  return static_cast<int32_t>(incoming_frames_.size());
-}
-
-VideoFrame VideoRenderFrames::FrameToRender() {
-  VideoFrame render_frame;
-  // Get the newest frame that can be released for rendering.
-  while (!incoming_frames_.empty() && TimeToNextFrameRelease() <= 0) {
-    render_frame = incoming_frames_.front();
-    incoming_frames_.pop_front();
-  }
-  return render_frame;
-}
-
-int32_t VideoRenderFrames::ReleaseAllFrames() {
-  incoming_frames_.clear();
-  return 0;
-}
-
-uint32_t VideoRenderFrames::TimeToNextFrameRelease() {
-  if (incoming_frames_.empty()) {
-    return KEventMaxWaitTimeMs;
-  }
-  const int64_t time_to_release = incoming_frames_.front().render_time_ms() -
-                                  render_delay_ms_ -
-                                  TickTime::MillisecondTimestamp();
-  return time_to_release < 0 ? 0u : static_cast<uint32_t>(time_to_release);
-}
-
-int32_t VideoRenderFrames::SetRenderDelay(
-    const uint32_t render_delay) {
-  if (render_delay < kMinRenderDelayMs ||
-      render_delay > kMaxRenderDelayMs) {
-    WEBRTC_TRACE(kTraceWarning, kTraceVideoRenderer,
-                 -1, "%s(%d): Invalid argument.", __FUNCTION__,
-                 render_delay);
-    return -1;
-  }
-
-  render_delay_ms_ = render_delay;
-  return 0;
-}
-
-}  // namespace webrtc