Reland of Add framerate to VideoSinkWants and ability to signal on overuse

webrtc/media/base/fakevideocapturer.h

 /*
  *  Copyright (c) 2004 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 48 matching lines @@
   bool CaptureFrame() {
     if (!GetCaptureFormat()) {
       return false;
     }
     return CaptureCustomFrame(GetCaptureFormat()->width,
                               GetCaptureFormat()->height,
                               GetCaptureFormat()->interval,
                               GetCaptureFormat()->fourcc);
   }
   bool CaptureCustomFrame(int width, int height, uint32_t fourcc) {
-    // default to 30fps
-    return CaptureCustomFrame(width, height, 33333333, fourcc);
+    // Default to 30fps.
+    return CaptureCustomFrame(width, height, rtc::kNumNanosecsPerSec / 30,
+                              fourcc);
   }
   bool CaptureCustomFrame(int width,
                           int height,
                           int64_t timestamp_interval,
                           uint32_t fourcc) {
     if (!running_) {
       return false;
     }
     RTC_CHECK(fourcc == FOURCC_I420);
     RTC_CHECK(width > 0);
     RTC_CHECK(height > 0);
 
     int adapted_width;
     int adapted_height;
     int crop_width;
     int crop_height;
     int crop_x;
     int crop_y;
 
     // TODO(nisse): It's a bit silly to have this logic in a fake
     // class. Child classes of VideoCapturer are expected to call
     // AdaptFrame, and the test case
     // VideoCapturerTest.SinkWantsMaxPixelAndMaxPixelCountStepUp
     // depends on this.
-    if (AdaptFrame(width, height, 0, 0, &adapted_width, &adapted_height,
-                   &crop_width, &crop_height, &crop_x, &crop_y, nullptr)) {
+    if (AdaptFrame(width, height,
+                   next_timestamp_ / rtc::kNumNanosecsPerMicrosec,
+                   next_timestamp_ / rtc::kNumNanosecsPerMicrosec,
+                   &adapted_width, &adapted_height, &crop_width, &crop_height,
+                   &crop_x, &crop_y, nullptr)) {
       rtc::scoped_refptr<webrtc::I420Buffer> buffer(
           webrtc::I420Buffer::Create(adapted_width, adapted_height));
       buffer->InitializeData();
 
       OnFrame(webrtc::VideoFrame(
                   buffer, rotation_,
                   next_timestamp_ / rtc::kNumNanosecsPerMicrosec),
               width, height);
     }
     next_timestamp_ += timestamp_interval;
@@ skipping 32 matching lines @@
   bool running_;
   int64_t initial_timestamp_;
   int64_t next_timestamp_;
   const bool is_screencast_;
   webrtc::VideoRotation rotation_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_FAKEVIDEOCAPTURER_H_