Fixing the interaction between codec bitrate limit and "b=AS".

webrtc/media/base/mediachannel.h

 /*
  *  Copyright (c) 2004 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.
  */
 
@@ skipping 75 matching lines @@
 static T MinPositive(T a, T b) {
   if (a <= 0) {
     return b;
   }
   if (b <= 0) {
     return a;
   }
   return std::min(a, b);
 }
 
+template <typename T>
+static T MinNonNegative(T a, T b) {
+  if (a < 0) {
+    return b;
+  }
+  if (b < 0) {
+    return a;
+  }
+  return std::min(a, b);
+}
+
 // Construction-time settings, passed to
 // MediaControllerInterface::Create, and passed on when creating
 // MediaChannels.
 struct MediaConfig {
   // Set DSCP value on packets. This flag comes from the
   // PeerConnection constraint 'googDscp'.
   bool enable_dscp = false;
 
   // Video-specific config.
   struct Video {
@@ skipping 1020 matching lines @@
   // Signal when the media channel is ready to send the stream. Arguments are:
   //     writable(bool)
   sigslot::signal1<bool> SignalReadyToSend;
   // Signal for notifying that the remote side has closed the DataChannel.
   sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_