Add framerate to VideoSinkWants and ability to signal on overuse

webrtc/media/engine/fakewebrtccall.cc

Index: webrtc/media/engine/fakewebrtccall.cc
diff --git a/webrtc/media/engine/fakewebrtccall.cc b/webrtc/media/engine/fakewebrtccall.cc
index 9a05ae67e4a72669a6881fa29b2eebea46d060b5..5a57487928e619359dda5fe830ec923556966878 100644
--- a/webrtc/media/engine/fakewebrtccall.cc
+++ b/webrtc/media/engine/fakewebrtccall.cc
@@ -108,6 +108,7 @@ FakeVideoSendStream::FakeVideoSendStream(
       config_(std::move(config)),
       codec_settings_set_(false),
       resolution_scaling_enabled_(false),
+      framerate_scaling_enalbed_(false),

[nisse-webrtc, 2017/03/14 09:00:28]

Spelling.

[sprang_webrtc, 2017/03/14 14:15:02]

Done.

       source_(nullptr),
       num_swapped_frames_(0) {
   RTC_DCHECK(config.encoder_settings.encoder != NULL);
@@ -252,9 +253,21 @@ void FakeVideoSendStream::SetSource(
   if (source_)
     source_->RemoveSink(this);
   source_ = source;
-  resolution_scaling_enabled_ =
-      degradation_preference !=
-      webrtc::VideoSendStream::DegradationPreference::kMaintainResolution;
+  switch (degradation_preference) {

[nisse-webrtc, 2017/03/14 09:00:28]

This is only ever called once in the object's lifetime?

Otherwise, you'd need to assign both flags in all cases.

[sprang_webrtc, 2017/03/14 14:15:02]

Right, thanks. I misread this code.

+    case DegradationPreference::kMaintainFramerate:
+      resolution_scaling_enabled_ = true;
+      break;
+    case DegradationPreference::kMaintainResolution:
+      framerate_scaling_enalbed_ = true;
+      break;
+    case DegradationPreference::kBalanced:
+      resolution_scaling_enabled_ = true;
+      framerate_scaling_enalbed_ = true;
+      break;
+    case DegradationPreference::kDegradationDisabled:
+      // No scaling enabled.
+      break;
+  }
   if (source)
     source->AddOrUpdateSink(this, resolution_scaling_enabled_
                                       ? sink_wants_
@@ -333,7 +346,9 @@ FakeCall::FakeCall(const webrtc::Call::Config& config)
       audio_network_state_(webrtc::kNetworkUp),
       video_network_state_(webrtc::kNetworkUp),
       num_created_send_streams_(0),
-      num_created_receive_streams_(0) {}
+      num_created_receive_streams_(0),
+      audio_transport_overhead_(0),
+      video_transport_overhead_(0) {}
 
 FakeCall::~FakeCall() {
   EXPECT_EQ(0u, video_send_streams_.size());