| 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 2491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2502 continue; | 2502 continue; |
| 2503 } | 2503 } |
| 2504 | 2504 |
| 2505 case VideoCodec::CODEC_ULPFEC: { | 2505 case VideoCodec::CODEC_ULPFEC: { |
| 2506 // ULPFEC payload type, should not have duplicates. | 2506 // ULPFEC payload type, should not have duplicates. |
| 2507 RTC_DCHECK(ulpfec_config.ulpfec_payload_type == -1); | 2507 RTC_DCHECK(ulpfec_config.ulpfec_payload_type == -1); |
| 2508 ulpfec_config.ulpfec_payload_type = in_codec.id; | 2508 ulpfec_config.ulpfec_payload_type = in_codec.id; |
| 2509 continue; | 2509 continue; |
| 2510 } | 2510 } |
| 2511 | 2511 |
| 2512 case VideoCodec::CODEC_FLEXFEC: { |
| 2513 // TODO(brandtr): To be implemented. |
| 2514 continue; |
| 2515 } |
| 2516 |
| 2512 case VideoCodec::CODEC_RTX: { | 2517 case VideoCodec::CODEC_RTX: { |
| 2513 int associated_payload_type; | 2518 int associated_payload_type; |
| 2514 if (!in_codec.GetParam(kCodecParamAssociatedPayloadType, | 2519 if (!in_codec.GetParam(kCodecParamAssociatedPayloadType, |
| 2515 &associated_payload_type) || | 2520 &associated_payload_type) || |
| 2516 !IsValidRtpPayloadType(associated_payload_type)) { | 2521 !IsValidRtpPayloadType(associated_payload_type)) { |
| 2517 LOG(LS_ERROR) | 2522 LOG(LS_ERROR) |
| 2518 << "RTX codec with invalid or no associated payload type: " | 2523 << "RTX codec with invalid or no associated payload type: " |
| 2519 << in_codec.ToString(); | 2524 << in_codec.ToString(); |
| 2520 return std::vector<VideoCodecSettings>(); | 2525 return std::vector<VideoCodecSettings>(); |
| 2521 } | 2526 } |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2559 rtx_mapping[video_codecs[i].codec.id] != | 2564 rtx_mapping[video_codecs[i].codec.id] != |
| 2560 ulpfec_config.red_payload_type) { | 2565 ulpfec_config.red_payload_type) { |
| 2561 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2566 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
| 2562 } | 2567 } |
| 2563 } | 2568 } |
| 2564 | 2569 |
| 2565 return video_codecs; | 2570 return video_codecs; |
| 2566 } | 2571 } |
| 2567 | 2572 |
| 2568 } // namespace cricket | 2573 } // namespace cricket |
| OLD | NEW |