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

webrtc/media/engine/simulcast.h

 /*
  *  Copyright (c) 2014 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.
  */
 
 #ifndef WEBRTC_MEDIA_ENGINE_SIMULCAST_H_
 #define WEBRTC_MEDIA_ENGINE_SIMULCAST_H_
 
 #include <vector>
 
 #include "webrtc/base/basictypes.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/config.h"
 
 namespace cricket {
 struct StreamParams;
 
 // Config for use with screen cast when temporal layers are enabled.
 struct ScreenshareLayerConfig {
  public:
   ScreenshareLayerConfig(int tl0_bitrate, int tl1_bitrate);
 
@@ skipping 11 matching lines @@
 
 // TODO(pthatcher): Write unit tests just for these functions,
 // independent of WebrtcVideoEngine.
 
 int GetTotalMaxBitrateBps(const std::vector<webrtc::VideoStream>& streams);
 
 // Get the ssrcs of the SIM group from the stream params.
 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
 
 #endif  // WEBRTC_MEDIA_ENGINE_SIMULCAST_H_