Remove frame time scheduing 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.
  */
 
@@ skipping 14 matching lines @@
 #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/thread_wrapper.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 
 IncomingVideoStream::IncomingVideoStream(uint32_t stream_id)
+    : IncomingVideoStream(stream_id, false) {}
+
+IncomingVideoStream::IncomingVideoStream(uint32_t stream_id,
+                                         bool renderer_has_timing)
     : stream_id_(stream_id),
+      renderer_has_timing_(renderer_has_timing),
       stream_critsect_(CriticalSectionWrapper::CreateCriticalSection()),
       thread_critsect_(CriticalSectionWrapper::CreateCriticalSection()),
       buffer_critsect_(CriticalSectionWrapper::CreateCriticalSection()),
       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),
       last_render_time_ms_(0),
       temp_frame_(),
       start_image_(),
       timeout_image_(),
-      timeout_time_() {
-}
+      timeout_time_() {}
 
 IncomingVideoStream::~IncomingVideoStream() {
   Stop();
 }
 
 VideoRenderCallback* IncomingVideoStream::ModuleCallback() {
   CriticalSectionScoped cs(stream_critsect_.get());
   return this;
 }
 
@@ skipping 11 matching lines @@
   if (now_ms >= last_rate_calculation_time_ms_ + kFrameRatePeriodMs) {
     incoming_rate_ =
         static_cast<uint32_t>(1000 * num_frames_since_last_calculation_ /
                               (now_ms - last_rate_calculation_time_ms_));
     num_frames_since_last_calculation_ = 0;
     last_rate_calculation_time_ms_ = now_ms;
   }
 
   // Insert frame.
   CriticalSectionScoped csB(buffer_critsect_.get());
-  if (render_buffers_->AddFrame(video_frame) == 1)
+  if (render_buffers_->AddFrame(video_frame) == 1 || renderer_has_timing_)
     deliver_buffer_event_->Set();
 
   return 0;
 }
 
 int32_t IncomingVideoStream::SetStartImage(const VideoFrame& video_frame) {
   CriticalSectionScoped csS(thread_critsect_.get());
   return start_image_.CopyFrame(video_frame);
 }
 
@@ skipping 111 matching lines @@
     }
     // Get a new frame to render and the time for the frame after this one.
     VideoFrame frame_to_render;
     uint32_t wait_time;
     {
       CriticalSectionScoped cs(buffer_critsect_.get());
       frame_to_render = render_buffers_->FrameToRender();
       wait_time = render_buffers_->TimeToNextFrameRelease();
     }
 
-    // Set timer for next frame to render.
-    if (wait_time > kEventMaxWaitTimeMs) {
-      wait_time = kEventMaxWaitTimeMs;
+    if (!renderer_has_timing_) {
+      // Set timer for next frame to render.
+      if (wait_time > kEventMaxWaitTimeMs) {
+        wait_time = kEventMaxWaitTimeMs;
+      }
+      deliver_buffer_event_->StartTimer(false, wait_time);
     }
-    deliver_buffer_event_->StartTimer(false, wait_time);
 
     if (frame_to_render.IsZeroSize()) {
       if (render_callback_) {
         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_);
         } else if (!timeout_image_.IsZeroSize() &&
                    last_render_time_ms_ + timeout_time_ <
                        TickTime::MillisecondTimestamp()) {
@@ skipping 15 matching lines @@
     }
 
     // We're done with this frame.
     if (!frame_to_render.IsZeroSize())
       last_render_time_ms_ = frame_to_render.render_time_ms();
   }
   return true;
 }
 
 }  // namespace webrtc