Updated structures and functions for setting the max bitrate limit to take rtc::Optional<int>

webrtc/media/engine/simulcast.h

Index: webrtc/media/engine/simulcast.h
diff --git a/webrtc/media/engine/simulcast.h b/webrtc/media/engine/simulcast.h
index 20be4c487e443f5b20bc0e051d2931817590ca84..f6b269f8867d4ce814dbceb269143efaa368c513 100644
--- a/webrtc/media/engine/simulcast.h
+++ b/webrtc/media/engine/simulcast.h
@@ -14,6 +14,7 @@
 #include <vector>
 
 #include "webrtc/base/basictypes.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/config.h"
 
 namespace cricket {
@@ -45,12 +46,13 @@ int GetTotalMaxBitrateBps(const std::vector<webrtc::VideoStream>& streams);
 void GetSimulcastSsrcs(const StreamParams& sp, std::vector<uint32_t>* ssrcs);
 
 // Get simulcast settings.
-std::vector<webrtc::VideoStream> GetSimulcastConfig(size_t max_streams,
-                                                    int width,
-                                                    int height,
-                                                    int max_bitrate_bps,
-                                                    int max_qp,
-                                                    int max_framerate);
+std::vector<webrtc::VideoStream> GetSimulcastConfig(
+    size_t max_streams,
+    int width,
+    int height,
+    rtc::Optional<int> max_bitrate_bps,
+    int max_qp,
+    int max_framerate);

[stefan-webrtc, 2016/03/18 08:28:40]

Any plan on making other parameters optional? Seems like max_qp could be
optional for instance.

[pthatcher1, 2016/03/18 16:45:16]

I think it makes sense to make a lot of these things Optional, but perhaps just
make it a TODO for now.  This CL is already pretty big.

[skvlad, 2016/03/18 18:01:52]

It looks like this function gets definite values for all the other parameters
(width/height/max_qp/max_framerate). The caller, however, uses some defaults.
I've added a TODO there.

 
 }  // namespace cricket