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

webrtc/media/base/videobroadcaster_unittest.cc

 /*
  *  Copyright 2016 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 @@
 
   broadcaster.AddOrUpdateSink(&sink2, wants2);
   EXPECT_TRUE(broadcaster.wants().rotation_applied);
 
   broadcaster.RemoveSink(&sink2);
   EXPECT_FALSE(broadcaster.wants().rotation_applied);
 }
 
 TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxPixelCount) {
   VideoBroadcaster broadcaster;
-  EXPECT_EQ(std::numeric_limits<int>::max(),
-            broadcaster.wants().max_pixel_count);
+  EXPECT_TRUE(!broadcaster.wants().max_pixel_count);
 
   FakeVideoRenderer sink1;
   VideoSinkWants wants1;
-  wants1.max_pixel_count = 1280 * 720;
+  wants1.max_pixel_count = rtc::Optional<int>(1280 * 720);
 
   broadcaster.AddOrUpdateSink(&sink1, wants1);
-  EXPECT_EQ(1280 * 720, broadcaster.wants().max_pixel_count);
+  EXPECT_EQ(1280 * 720, *broadcaster.wants().max_pixel_count);
 
   FakeVideoRenderer sink2;
   VideoSinkWants wants2;
-  wants2.max_pixel_count = 640 * 360;
+  wants2.max_pixel_count = rtc::Optional<int>(640 * 360);
   broadcaster.AddOrUpdateSink(&sink2, wants2);
-  EXPECT_EQ(640 * 360, broadcaster.wants().max_pixel_count);
+  EXPECT_EQ(640 * 360, *broadcaster.wants().max_pixel_count);
 
   broadcaster.RemoveSink(&sink2);
-  EXPECT_EQ(1280 * 720, broadcaster.wants().max_pixel_count);
+  EXPECT_EQ(1280 * 720, *broadcaster.wants().max_pixel_count);
 }
 
 TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxAndTargetPixelCount) {
   VideoBroadcaster broadcaster;
   EXPECT_TRUE(!broadcaster.wants().target_pixel_count);
 
   FakeVideoRenderer sink1;
   VideoSinkWants wants1;
   wants1.target_pixel_count = rtc::Optional<int>(1280 * 720);
 
   broadcaster.AddOrUpdateSink(&sink1, wants1);
   EXPECT_EQ(1280 * 720, *broadcaster.wants().target_pixel_count);
 
   FakeVideoRenderer sink2;
   VideoSinkWants wants2;
   wants2.target_pixel_count = rtc::Optional<int>(640 * 360);
   broadcaster.AddOrUpdateSink(&sink2, wants2);
   EXPECT_EQ(640 * 360, *broadcaster.wants().target_pixel_count);
 
   broadcaster.RemoveSink(&sink2);
   EXPECT_EQ(1280 * 720, *broadcaster.wants().target_pixel_count);
 }
 
-TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxFramerate) {
-  VideoBroadcaster broadcaster;
-  EXPECT_EQ(std::numeric_limits<int>::max(),
-            broadcaster.wants().max_framerate_fps);
-
-  FakeVideoRenderer sink1;
-  VideoSinkWants wants1;
-  wants1.max_framerate_fps = 30;
-
-  broadcaster.AddOrUpdateSink(&sink1, wants1);
-  EXPECT_EQ(30, broadcaster.wants().max_framerate_fps);
-
-  FakeVideoRenderer sink2;
-  VideoSinkWants wants2;
-  wants2.max_framerate_fps = 15;
-  broadcaster.AddOrUpdateSink(&sink2, wants2);
-  EXPECT_EQ(15, broadcaster.wants().max_framerate_fps);
-
-  broadcaster.RemoveSink(&sink2);
-  EXPECT_EQ(30, broadcaster.wants().max_framerate_fps);
-}
-
 TEST(VideoBroadcasterTest, SinkWantsBlackFrames) {
   VideoBroadcaster broadcaster;
   EXPECT_TRUE(!broadcaster.wants().black_frames);
 
   FakeVideoRenderer sink1;
   VideoSinkWants wants1;
   wants1.black_frames = true;
   broadcaster.AddOrUpdateSink(&sink1, wants1);
 
   FakeVideoRenderer sink2;
@@ skipping 21 matching lines @@
   broadcaster.AddOrUpdateSink(&sink2, wants2);
 
   webrtc::VideoFrame frame2(buffer, webrtc::kVideoRotation_0,
                             30 /* timestamp_us */);
   broadcaster.OnFrame(frame2);
   EXPECT_FALSE(sink1.black_frame());
   EXPECT_EQ(30, sink1.timestamp_us());
   EXPECT_TRUE(sink2.black_frame());
   EXPECT_EQ(30, sink2.timestamp_us());
 }