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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 webrtc::RtpExtension::kTransportSequenceNumberUri, | 516 webrtc::RtpExtension::kTransportSequenceNumberUri, |
517 webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); | 517 webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); |
518 capabilities.header_extensions.push_back( | 518 capabilities.header_extensions.push_back( |
519 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, | 519 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, |
520 webrtc::RtpExtension::kPlayoutDelayDefaultId)); | 520 webrtc::RtpExtension::kPlayoutDelayDefaultId)); |
521 if (IsVideoContentTypeExtensionFieldTrialEnabled()) { | 521 if (IsVideoContentTypeExtensionFieldTrialEnabled()) { |
522 capabilities.header_extensions.push_back( | 522 capabilities.header_extensions.push_back( |
523 webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri, | 523 webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri, |
524 webrtc::RtpExtension::kVideoContentTypeDefaultId)); | 524 webrtc::RtpExtension::kVideoContentTypeDefaultId)); |
525 } | 525 } |
| 526 // TODO(ilnik): Add kVideoTimingUri/kVideoTimingDefaultId to capabilities. |
| 527 // Possibly inside field trial. |
526 return capabilities; | 528 return capabilities; |
527 } | 529 } |
528 | 530 |
529 void WebRtcVideoEngine::SetExternalDecoderFactory( | 531 void WebRtcVideoEngine::SetExternalDecoderFactory( |
530 WebRtcVideoDecoderFactory* decoder_factory) { | 532 WebRtcVideoDecoderFactory* decoder_factory) { |
531 RTC_DCHECK(!initialized_); | 533 RTC_DCHECK(!initialized_); |
532 external_decoder_factory_ = decoder_factory; | 534 external_decoder_factory_ = decoder_factory; |
533 } | 535 } |
534 | 536 |
535 void WebRtcVideoEngine::SetExternalEncoderFactory( | 537 void WebRtcVideoEngine::SetExternalEncoderFactory( |
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2669 rtx_mapping[video_codecs[i].codec.id] != | 2671 rtx_mapping[video_codecs[i].codec.id] != |
2670 ulpfec_config.red_payload_type) { | 2672 ulpfec_config.red_payload_type) { |
2671 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2673 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2672 } | 2674 } |
2673 } | 2675 } |
2674 | 2676 |
2675 return video_codecs; | 2677 return video_codecs; |
2676 } | 2678 } |
2677 | 2679 |
2678 } // namespace cricket | 2680 } // namespace cricket |
OLD | NEW |