commit 6c13fd9071453b435b46b04e52794c8172988a66
author Evan Shrubsole <eshr@google.com> Tue Jan 21 08:57:54 2020
committer Commit Bot <commit-bot@chromium.org> Tue Jan 21 10:24:31 2020
tree 71223b0132c1610d3b01413bd3a18f2eb7a7a35c
parent 73aa2de3d7613c54b7d0b45ee5df2faa7c0635d4

Move bandwidth overuse detection out of VideoStreamEncoder

Bug: webrtc:11222
Change-Id: I12ccd008c848a0146fb22292f8dac46d1f7be9b4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166531
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@google.com>
Cr-Commit-Position: refs/heads/master@{#30329}

video/overuse_frame_detector_resource_adaptation_module.cc

diff --git a/video/overuse_frame_detector_resource_adaptation_module.cc b/video/overuse_frame_detector_resource_adaptation_module.cc
index ea082a5..2ca3435 100644
--- a/video/overuse_frame_detector_resource_adaptation_module.cc
+++ b/video/overuse_frame_detector_resource_adaptation_module.cc
@@ -450,6 +450,24 @@
                                encode_duration_us);
 }
 
+void OveruseFrameDetectorResourceAdaptationModule::FrameDroppedDueToSize() {
+  int fps_count = GetConstAdaptCounter().FramerateCount(
+      AdaptationObserverInterface::AdaptReason::kQuality);
+  int res_count = GetConstAdaptCounter().ResolutionCount(
+      AdaptationObserverInterface::AdaptReason::kQuality);
+  AdaptDown(AdaptationObserverInterface::AdaptReason::kQuality);
+  if (degradation_preference() == DegradationPreference::BALANCED &&
+      GetConstAdaptCounter().FramerateCount(
+          AdaptationObserverInterface::AdaptReason::kQuality) > fps_count) {
+    // Adapt framerate in same step as resolution.
+    AdaptDown(AdaptationObserverInterface::AdaptReason::kQuality);
+  }
+  if (GetConstAdaptCounter().ResolutionCount(
+          AdaptationObserverInterface::AdaptReason::kQuality) > res_count) {
+    encoder_stats_observer_->OnInitialQualityResolutionAdaptDown();
+  }
+}
+
 void OveruseFrameDetectorResourceAdaptationModule::SetLastFramePixelCount(
     absl::optional<int> last_frame_pixel_count) {
   last_frame_pixel_count_ = last_frame_pixel_count;

video/overuse_frame_detector_resource_adaptation_module.h

diff --git a/video/overuse_frame_detector_resource_adaptation_module.h b/video/overuse_frame_detector_resource_adaptation_module.h
index d3b88e5..798d386 100644
--- a/video/overuse_frame_detector_resource_adaptation_module.h
+++ b/video/overuse_frame_detector_resource_adaptation_module.h
@@ -89,6 +89,7 @@
                  int64_t time_sent_in_us,
                  int64_t capture_time_us,
                  absl::optional<int> encode_duration_us);
+  void FrameDroppedDueToSize();
 
   // Various other settings and feedback mechanisms.
   // TODO(hbos): Find a common interface that would make sense for a generic

video/video_stream_encoder.cc

diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 2a6f14c..96d0d4d 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -1084,24 +1084,7 @@
 
   if (DropDueToSize(video_frame.size())) {
     RTC_LOG(LS_INFO) << "Dropping frame. Too large for target bitrate.";
-    int fps_count =
-        resource_adaptation_module_->GetConstAdaptCounter().FramerateCount(
-            AdaptationObserverInterface::AdaptReason::kQuality);
-    int res_count =
-        resource_adaptation_module_->GetConstAdaptCounter().ResolutionCount(
-            AdaptationObserverInterface::AdaptReason::kQuality);
-    TriggerAdaptDown(AdaptationObserverInterface::AdaptReason::kQuality);
-    if (resource_adaptation_module_->degradation_preference() ==
-            DegradationPreference::BALANCED &&
-        resource_adaptation_module_->GetConstAdaptCounter().FramerateCount(
-            AdaptationObserverInterface::AdaptReason::kQuality) > fps_count) {
-      // Adapt framerate in same step as resolution.
-      TriggerAdaptDown(AdaptationObserverInterface::AdaptReason::kQuality);
-    }
-    if (resource_adaptation_module_->GetConstAdaptCounter().ResolutionCount(
-            AdaptationObserverInterface::AdaptReason::kQuality) > res_count) {
-      encoder_stats_observer_->OnInitialQualityResolutionAdaptDown();
-    }
+    resource_adaptation_module_->FrameDroppedDueToSize();
     ++initial_framedrop_;
     // Storing references to a native buffer risks blocking frame capture.
     if (video_frame.video_frame_buffer()->type() !=