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

webrtc/video/overuse_frame_detector.h

 /*
  *  Copyright (c) 2013 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 69 matching lines @@
   // Called for each captured frame.
   void FrameCaptured(const VideoFrame& frame, int64_t time_when_first_seen_us);
 
   // Called for each sent frame.
   void FrameSent(uint32_t timestamp, int64_t time_sent_in_us);
 
  protected:
   void CheckForOveruse();  // Protected for test purposes.
 
  private:
-  class OverdoseInjector;
   class SendProcessingUsage;
   class CheckOveruseTask;
   struct FrameTiming {
     FrameTiming(int64_t capture_time_us, uint32_t timestamp, int64_t now)
         : capture_time_us(capture_time_us),
           timestamp(timestamp),
           capture_us(now),
           last_send_us(-1) {}
     int64_t capture_time_us;
     uint32_t timestamp;
     int64_t capture_us;
     int64_t last_send_us;
   };
 
   void EncodedFrameTimeMeasured(int encode_duration_ms);
   bool IsOverusing(const CpuOveruseMetrics& metrics);
   bool IsUnderusing(const CpuOveruseMetrics& metrics, int64_t time_now);
 
   bool FrameTimeoutDetected(int64_t now) const;
   bool FrameSizeChanged(int num_pixels) const;
 
   void ResetAll(int num_pixels);
 
-  static std::unique_ptr<SendProcessingUsage> CreateSendProcessingUsage(
-      const CpuOveruseOptions& options);
-
   rtc::SequencedTaskChecker task_checker_;
   // Owned by the task queue from where StartCheckForOveruse is called.
   CheckOveruseTask* check_overuse_task_;
 
   const CpuOveruseOptions options_;
 
   // Observer getting overuse reports.
   AdaptationObserverInterface* const observer_;
   EncodedFrameObserver* const encoder_timing_;
 
@@ skipping 19 matching lines @@
   // allocs)?
   const std::unique_ptr<SendProcessingUsage> usage_ GUARDED_BY(task_checker_);
   std::list<FrameTiming> frame_timing_ GUARDED_BY(task_checker_);
 
   RTC_DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_