OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 17 matching lines...) Expand all Loading... | |
28 return allocation; | 28 return allocation; |
29 | 29 |
30 if (total_bitrate_bps < codec_.minBitrate * 1000) { | 30 if (total_bitrate_bps < codec_.minBitrate * 1000) { |
31 allocation.SetBitrate(0, 0, codec_.minBitrate * 1000); | 31 allocation.SetBitrate(0, 0, codec_.minBitrate * 1000); |
32 } else if (codec_.maxBitrate > 0 && | 32 } else if (codec_.maxBitrate > 0 && |
33 total_bitrate_bps > codec_.maxBitrate * 1000) { | 33 total_bitrate_bps > codec_.maxBitrate * 1000) { |
34 allocation.SetBitrate(0, 0, codec_.maxBitrate * 1000); | 34 allocation.SetBitrate(0, 0, codec_.maxBitrate * 1000); |
35 } else { | 35 } else { |
36 allocation.SetBitrate(0, 0, total_bitrate_bps); | 36 allocation.SetBitrate(0, 0, total_bitrate_bps); |
37 } | 37 } |
38 | |
kthelgason
2017/01/18 12:20:22
This snuck in by accident, sorry about that.
| |
39 return allocation; | 38 return allocation; |
40 } | 39 } |
41 | 40 |
42 uint32_t DefaultVideoBitrateAllocator::GetPreferredBitrateBps( | 41 uint32_t DefaultVideoBitrateAllocator::GetPreferredBitrateBps( |
43 uint32_t framerate) { | 42 uint32_t framerate) { |
44 return GetAllocation(codec_.maxBitrate * 1000, framerate).get_sum_bps(); | 43 return GetAllocation(codec_.maxBitrate * 1000, framerate).get_sum_bps(); |
45 } | 44 } |
46 | 45 |
47 } // namespace webrtc | 46 } // namespace webrtc |
OLD | NEW |