OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
200 } else { | 200 } else { |
201 config.min_bitrate_bps = 0; | 201 config.min_bitrate_bps = 0; |
202 } | 202 } |
203 if (codec.GetParam(kCodecParamStartBitrate, &bitrate_kbps) && | 203 if (codec.GetParam(kCodecParamStartBitrate, &bitrate_kbps) && |
204 bitrate_kbps > 0) { | 204 bitrate_kbps > 0) { |
205 config.start_bitrate_bps = bitrate_kbps * 1000; | 205 config.start_bitrate_bps = bitrate_kbps * 1000; |
206 } else { | 206 } else { |
207 // Do not reconfigure start bitrate unless it's specified and positive. | 207 // Do not reconfigure start bitrate unless it's specified and positive. |
208 config.start_bitrate_bps = -1; | 208 config.start_bitrate_bps = -1; |
209 } | 209 } |
210 if (codec.GetParam(kCodecParamMaxBitrate, &bitrate_kbps) && | 210 // Codec max bitrate should be set and capped by encoder config, not global |
211 bitrate_kbps > 0) { | 211 // bitrate config. |
Taylor Brandstetter
2017/03/09 23:48:38
nit: This seems independent enough to warrant bein
stefan-webrtc
2017/03/10 08:14:53
I agree that we should do this independently. And
pbos-webrtc
2017/03/10 18:52:09
Abandoned.
| |
212 config.max_bitrate_bps = bitrate_kbps * 1000; | 212 config.max_bitrate_bps = -1; |
213 } else { | |
214 config.max_bitrate_bps = -1; | |
215 } | |
216 return config; | 213 return config; |
217 } | 214 } |
218 } // namespace cricket | 215 } // namespace cricket |
OLD | NEW |