Add framerate to VideoSinkWants and ability to signal on overuse

webrtc/media/base/videobroadcaster_unittest.cc

Index: webrtc/media/base/videobroadcaster_unittest.cc
diff --git a/webrtc/media/base/videobroadcaster_unittest.cc b/webrtc/media/base/videobroadcaster_unittest.cc
index 5274868204589856369a9a1a46a9b41c68c37b7c..e6bcce5d232fb778f0be3c21e1154aa34705ee52 100644
--- a/webrtc/media/base/videobroadcaster_unittest.cc
+++ b/webrtc/media/base/videobroadcaster_unittest.cc
@@ -10,9 +10,10 @@
 
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/gunit.h"
+//#include "webrtc/base/gunit.h"

[kthelgason, 2017/02/27 14:02:39]

I guess this should not have been included?

[sprang_webrtc, 2017/02/28 08:46:28]

Oops. Removed

 #include "webrtc/media/base/fakevideorenderer.h"
 #include "webrtc/media/base/videobroadcaster.h"
+#include "webrtc/test/gtest.h"
 
 using rtc::VideoBroadcaster;
 using rtc::VideoSinkWants;
@@ -127,6 +128,27 @@ TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxAndTargetPixelCount) {
   EXPECT_EQ(1280 * 720, *broadcaster.wants().target_pixel_count);
 }
 
+TEST(VideoBroadcasterTest, AppliesMinOfSinkWantsMaxFramerate) {
+  VideoBroadcaster broadcaster;
+  EXPECT_TRUE(!broadcaster.wants().max_framerate_fps_);

[magjed_webrtc, 2017/02/27 09:30:35]

Use EXPECT_FALSE instead and remove the negation?

[sprang_webrtc, 2017/02/27 12:51:49]

Done.

+
+  FakeVideoRenderer sink1;
+  VideoSinkWants wants1;
+  wants1.max_framerate_fps_.emplace(30);
+
+  broadcaster.AddOrUpdateSink(&sink1, wants1);
+  EXPECT_EQ(30, *broadcaster.wants().max_framerate_fps_);
+
+  FakeVideoRenderer sink2;
+  VideoSinkWants wants2;
+  wants2.max_framerate_fps_.emplace(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);