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.
  */
 
 #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;
 using cricket::FakeVideoRenderer;
 
 
 TEST(VideoBroadcasterTest, frame_wanted) {
   VideoBroadcaster broadcaster;
   EXPECT_FALSE(broadcaster.frame_wanted());
 
@@ skipping 94 matching lines @@
   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_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);
 
   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());
 }