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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 LOG(LS_WARNING) << "Conflict merging red_rtx_payload_type configs: " | 289 LOG(LS_WARNING) << "Conflict merging red_rtx_payload_type configs: " |
290 << output->red_rtx_payload_type << " and " | 290 << output->red_rtx_payload_type << " and " |
291 << other.red_rtx_payload_type; | 291 << other.red_rtx_payload_type; |
292 } | 292 } |
293 output->red_rtx_payload_type = other.red_rtx_payload_type; | 293 output->red_rtx_payload_type = other.red_rtx_payload_type; |
294 } | 294 } |
295 } | 295 } |
296 | 296 |
297 // Returns true if the given codec is disallowed from doing simulcast. | 297 // Returns true if the given codec is disallowed from doing simulcast. |
298 bool IsCodecBlacklistedForSimulcast(const std::string& codec_name) { | 298 bool IsCodecBlacklistedForSimulcast(const std::string& codec_name) { |
299 return CodecNamesEq(codec_name, kH264CodecName) || | 299 return CodecNamesEq(codec_name, kVp9CodecName); |
300 CodecNamesEq(codec_name, kVp9CodecName); | |
301 } | 300 } |
302 | 301 |
303 // The selected thresholds for QVGA and VGA corresponded to a QP around 10. | 302 // The selected thresholds for QVGA and VGA corresponded to a QP around 10. |
304 // The change in QP declined above the selected bitrates. | 303 // The change in QP declined above the selected bitrates. |
305 static int GetMaxDefaultVideoBitrateKbps(int width, int height) { | 304 static int GetMaxDefaultVideoBitrateKbps(int width, int height) { |
306 if (width * height <= 320 * 240) { | 305 if (width * height <= 320 * 240) { |
307 return 600; | 306 return 600; |
308 } else if (width * height <= 640 * 480) { | 307 } else if (width * height <= 640 * 480) { |
309 return 1700; | 308 return 1700; |
310 } else if (width * height <= 960 * 540) { | 309 } else if (width * height <= 960 * 540) { |
(...skipping 2275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2586 rtx_mapping[video_codecs[i].codec.id] != | 2585 rtx_mapping[video_codecs[i].codec.id] != |
2587 fec_settings.red_payload_type) { | 2586 fec_settings.red_payload_type) { |
2588 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2587 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2589 } | 2588 } |
2590 } | 2589 } |
2591 | 2590 |
2592 return video_codecs; | 2591 return video_codecs; |
2593 } | 2592 } |
2594 | 2593 |
2595 } // namespace cricket | 2594 } // namespace cricket |
OLD | NEW |