Add framerate to VideoSinkWants and ability to signal on overuse

webrtc/media/base/videoadapter.cc

 /*
  *  Copyright (c) 2010 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 88 matching lines @@
 
 VideoAdapter::VideoAdapter(int required_resolution_alignment)
     : frames_in_(0),
       frames_out_(0),
       frames_scaled_(0),
       adaption_changes_(0),
       previous_width_(0),
       previous_height_(0),
       required_resolution_alignment_(required_resolution_alignment),
       resolution_request_target_pixel_count_(std::numeric_limits<int>::max()),
-      resolution_request_max_pixel_count_(std::numeric_limits<int>::max()) {}
+      resolution_request_max_pixel_count_(std::numeric_limits<int>::max()),
+      max_framerate_request_(std::numeric_limits<int>::max()) {}
 
 VideoAdapter::VideoAdapter() : VideoAdapter(1) {}
 
 VideoAdapter::~VideoAdapter() {}
 
 bool VideoAdapter::KeepFrame(int64_t in_timestamp_ns) {
   rtc::CritScope cs(&critical_section_);
-  if (!requested_format_ || requested_format_->interval == 0)
+  if (max_framerate_request_ <= 0)
+    return false;
+
+  int64_t frame_interval_ns = 0;
+  if (requested_format_ && requested_format_->interval)

[nisse-webrtc, 2017/03/08 08:08:54]

The second part of the conditioal seems unnecessary. I think i'd write it as

int64_t frame_interval_ns = request_format_ ? request_format_->interval : 0;

[sprang_webrtc, 2017/03/09 13:19:33]

Done.

+    frame_interval_ns = requested_format_->interval;
+
+  if (max_framerate_request_ != std::numeric_limits<int>::max()) {
+    frame_interval_ns = std::max<int64_t>(

[nisse-webrtc, 2017/03/08 08:08:54]

Can we make this part unconditional? We ought to have INTMAX >
kNumNanosecsPerSec, so result should be the same, second argument of std::max
being zero.

[sprang_webrtc, 2017/03/09 13:19:33]

Sure, but I'll add a comment about that as it's a little less readable then imo.

+        frame_interval_ns, rtc::kNumNanosecsPerSec / max_framerate_request_);
+  }
+
+  if (frame_interval_ns <= 0) {
+    // Frame rate throttling not enabled.
     return true;
+  }
 
   if (next_frame_timestamp_ns_) {
     // Time until next frame should be outputted.
     const int64_t time_until_next_frame_ns =
         (*next_frame_timestamp_ns_ - in_timestamp_ns);
 
-    // Continue if timestamp is withing expected range.
-    if (std::abs(time_until_next_frame_ns) < 2 * requested_format_->interval) {
+    // Continue if timestamp is within expected range.
+    if (std::abs(time_until_next_frame_ns) < 2 * frame_interval_ns) {
       // Drop if a frame shouldn't be outputted yet.
       if (time_until_next_frame_ns > 0)
         return false;
       // Time to output new frame.
-      *next_frame_timestamp_ns_ += requested_format_->interval;
+      *next_frame_timestamp_ns_ += frame_interval_ns;
       return true;
     }
   }
 
   // First timestamp received or timestamp is way outside expected range, so
   // reset. Set first timestamp target to just half the interval to prefer
   // keeping frames in case of jitter.
   next_frame_timestamp_ns_ =
-      rtc::Optional<int64_t>(in_timestamp_ns + requested_format_->interval / 2);
+      rtc::Optional<int64_t>(in_timestamp_ns + frame_interval_ns / 2);
   return true;
 }
 
 bool VideoAdapter::AdaptFrameResolution(int in_width,
                                         int in_height,
                                         int64_t in_timestamp_ns,
                                         int* cropped_width,
                                         int* cropped_height,
                                         int* out_width,
                                         int* out_height) {
@@ skipping 91 matching lines @@
 
   return true;
 }
 
 void VideoAdapter::OnOutputFormatRequest(const VideoFormat& format) {
   rtc::CritScope cs(&critical_section_);
   requested_format_ = rtc::Optional<VideoFormat>(format);
   next_frame_timestamp_ns_ = rtc::Optional<int64_t>();
 }
 
-void VideoAdapter::OnResolutionRequest(
+void VideoAdapter::OnResolutionFramerateRequest(
     const rtc::Optional<int>& target_pixel_count,
-    const rtc::Optional<int>& max_pixel_count) {
+    const rtc::Optional<int>& max_pixel_count,
+    const rtc::Optional<int>& framerate_fps) {
   rtc::CritScope cs(&critical_section_);
   resolution_request_max_pixel_count_ =
       max_pixel_count.value_or(std::numeric_limits<int>::max());
   resolution_request_target_pixel_count_ =
       target_pixel_count.value_or(resolution_request_max_pixel_count_);
+  max_framerate_request_ =
+      framerate_fps.value_or(std::numeric_limits<int>::max());
 }
 
 }  // namespace cricket