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

webrtc/video/end_to_end_tests.cc

Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index baf7161252935d5bf964c8c6e5453eb1a12993ce..cc8fbb6e92cf1b050e60119059cd3cf2cfc95a49 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -221,7 +221,8 @@ TEST_F(EndToEndTest, RendersSingleDelayedFrame) {
       test::FrameGenerator::CreateSquareGenerator(kWidth, kHeight));
   test::FrameForwarder frame_forwarder;
   video_send_stream_->SetSource(
-      &frame_forwarder, VideoSendStream::DegradationPreference::kBalanced);
+      &frame_forwarder,
+      VideoSendStream::DegradationPreference::kMaintainFramerate);
 
   frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
   EXPECT_TRUE(renderer.Wait())
@@ -266,7 +267,8 @@ TEST_F(EndToEndTest, TransmitsFirstFrame) {
                                                   kDefaultHeight));
   test::FrameForwarder frame_forwarder;
   video_send_stream_->SetSource(
-      &frame_forwarder, VideoSendStream::DegradationPreference::kBalanced);
+      &frame_forwarder,
+      VideoSendStream::DegradationPreference::kMaintainFramerate);
   frame_forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
 
   EXPECT_TRUE(renderer.Wait())
@@ -1500,7 +1502,7 @@ class MultiStreamTest {
           width, height, 30, Clock::GetRealTimeClock());
       send_streams[i]->SetSource(
           frame_generators[i],
-          VideoSendStream::DegradationPreference::kBalanced);
+          VideoSendStream::DegradationPreference::kMaintainFramerate);
       frame_generators[i]->Start();
     }
 
@@ -1947,7 +1949,7 @@ TEST_F(EndToEndTest, ObserversEncodedFrames) {
                                                   kDefaultHeight));
   test::FrameForwarder forwarder;
   video_send_stream_->SetSource(
-      &forwarder, VideoSendStream::DegradationPreference::kBalanced);
+      &forwarder, VideoSendStream::DegradationPreference::kMaintainFramerate);
   forwarder.IncomingCapturedFrame(*frame_generator->NextFrame());
 
   EXPECT_TRUE(post_encode_observer.Wait())