commit 6539f69746a660dda8a212a5da8b3b6171677542
author Niels Möller <nisse@webrtc.org> Thu Jan 18 08:58:50 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Thu Jan 18 10:42:07 2018 +0000
tree f1dd4e931014f27ee3e9749e45915cf1b606d21e
parent ad55676f7346e7301e95043bbe23efce78427708

Add VideoSendStream::Config::EncoderSettings::experiment_cpu_load_estimator.

And wire it up to methods on RTCConfiguration, via MediaConfig::Video.

Bug: webrtc:8504
Change-Id: I30805ee20c11d1d2fe552eb81f16d514db0ba4a8
Reviewed-on: https://webrtc-review.googlesource.com/39786
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21670}

api/peerconnectioninterface.h

diff --git a/api/peerconnectioninterface.h b/api/peerconnectioninterface.h
index 192a39a..a6c8c06 100644
--- a/api/peerconnectioninterface.h
+++ b/api/peerconnectioninterface.h
@@ -301,19 +301,19 @@
     bool operator==(const RTCConfiguration& o) const;
     bool operator!=(const RTCConfiguration& o) const;
 
-    bool dscp() { return media_config.enable_dscp; }
+    bool dscp() const { return media_config.enable_dscp; }
     void set_dscp(bool enable) { media_config.enable_dscp = enable; }
 
     // TODO(nisse): The corresponding flag in MediaConfig and
     // elsewhere should be renamed enable_cpu_adaptation.
-    bool cpu_adaptation() {
+    bool cpu_adaptation() const {
       return media_config.video.enable_cpu_overuse_detection;
     }
     void set_cpu_adaptation(bool enable) {
       media_config.video.enable_cpu_overuse_detection = enable;
     }
 
-    bool suspend_below_min_bitrate() {
+    bool suspend_below_min_bitrate() const {
       return media_config.video.suspend_below_min_bitrate;
     }
     void set_suspend_below_min_bitrate(bool enable) {
@@ -323,13 +323,19 @@
     // TODO(nisse): The negation in the corresponding MediaConfig
     // attribute is inconsistent, and it should be renamed at some
     // point.
-    bool prerenderer_smoothing() {
+    bool prerenderer_smoothing() const {
       return !media_config.video.disable_prerenderer_smoothing;
     }
     void set_prerenderer_smoothing(bool enable) {
       media_config.video.disable_prerenderer_smoothing = !enable;
     }
 
+    bool experiment_cpu_load_estimator() const {
+      return media_config.video.experiment_cpu_load_estimator;
+    }
+    void set_experiment_cpu_load_estimator(bool enable) {
+      media_config.video.experiment_cpu_load_estimator = enable;
+    }
     static const int kUndefined = -1;
     // Default maximum number of packets in the audio jitter buffer.
     static const int kAudioJitterBufferMaxPackets = 50;